summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Revert "Refactor IpConfiguration from WifiConfiguration""Jaewan Kim2014-04-075-551/+81
|\
| * Revert "Refactor IpConfiguration from WifiConfiguration"Jaewan Kim2014-04-075-551/+81
| | | | | | | | | | | | This reverts commit 1284767ceb1affa6d5af77fd26ccf7322df48a6d. Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
* | Revert "Hide IpConfiguration"Jaewan Kim2014-04-071-5/+19
| | | | | | | | | | | | This reverts commit d07372e2e96ed6d2012db8518e05018c9710cafb. Change-Id: I5728114dbd9ef37509e8ab3c942648ec92ef0c1a
* | Hide IpConfigurationJaewan Kim2014-04-071-19/+5
| | | | | | | | | | Bug: 7606609, Bug: 8687763 Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
* | Merge "Refactor IpConfiguration from WifiConfiguration"Jaewan Kim2014-04-075-81/+551
|\ \ | |/
| * Refactor IpConfiguration from WifiConfigurationJaewan Kim2014-04-075-81/+551
| | | | | | | | | | Bug: 7606609, Bug: 8687763 Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
* | am f403d60f: am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed ↵quddusc2014-04-051-7/+14
|\ \ | | | | | | | | | | | | | | | | | | gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs * commit 'f403d60fc8dfe2b833a65b6933a07c44d849e831': docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
| * \ am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping ↵quddusc2014-04-051-7/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs * commit '17878a9ab5c58f5b245bbdd0e8e16abbcde4a995': docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
| | * \ am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to ↵quddusc2014-04-051-7/+14
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs * commit 'b430ec756473330f47bda2d8f0c266b3398169c9': docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
| | | * \ am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B ↵quddusc2014-04-051-7/+14
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button should be used for back navigation in menus. Bug: 13487101" into klp-docs * commit '7db3875cdca4c94cb667d2d0cc86718f15e3305c': docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
| | | | * \ Merge "docs: Fixed gamepad mapping doc to recommend that B button should be ↵quddusc2014-04-051-7/+14
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | used for back navigation in menus. Bug: 13487101" into klp-docs
| | | | | * | docs: Fixed gamepad mapping doc to recommend that B button should be used ↵quddusc2014-03-261-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for back navigation in menus. Bug: 13487101 Change-Id: If62a7415262877b7ef4ca19fcf0ab77c5323f1cb
* | | | | | | am acf395fd: am 819239e5: Revert "Add stringType and requiredPermissions to ↵Etienne Le Grand2014-04-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SensorManager.java, as well as a permission for the heart rate sensor" * commit 'acf395fd9441bce9fbe68c1b7efbf824570284bc': Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
| * | | | | | am 819239e5: Revert "Add stringType and requiredPermissions to ↵Etienne Le Grand2014-04-056-272/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SensorManager.java, as well as a permission for the heart rate sensor" * commit '819239e5bec90ee3c861ac45fffac4a832a183a1': Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
| | * | | | | Revert "Add stringType and requiredPermissions to SensorManager.java, as ↵Etienne Le Grand2014-04-056-272/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well as a permission for the heart rate sensor" This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3. Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
* | | | | | | Revert "Add stringType and requiredPermissions to SensorManager.java, as ↵Etienne Le Grand2014-04-056-272/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well as a permission for the heart rate sensor" This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3. Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61 (cherry picked from commit 819239e5bec90ee3c861ac45fffac4a832a183a1)
* | | | | | | am bdfe3841: am fd53d835: Add stringType and requiredPermissions to ↵Etienne Le Grand2014-04-056-9/+272
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SensorManager.java, as well as a permission for the heart rate sensor * commit 'bdfe384106de364ea2effac6ab80108556d11649': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
| * | | | | | am fd53d835: Add stringType and requiredPermissions to SensorManager.java, ↵Etienne Le Grand2014-04-056-9/+272
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as well as a permission for the heart rate sensor * commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
| | * | | | | Add stringType and requiredPermissions to SensorManager.java, as well as a ↵Etienne Le Grand2014-04-046-9/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission for the heart rate sensor Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
* | | | | | | Merge "Back up the preferred home app, if any"Christopher Tate2014-04-052-10/+120
|\ \ \ \ \ \ \
| * | | | | | | Back up the preferred home app, if anyChristopher Tate2014-04-042-10/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user has stated a preference about their home app, make sure we capture that so that a system restore can return them to that preferred situation. It's built into the system metadata so that we can, if necessary, fast-path configuration of that home app while the rest of the restore operation is in flight. Change-Id: I64dfee8f7a2a9e40f556cd19298d7b367c6aa8dc
* | | | | | | | Merge "Fix sdk build"Deepanshu Gupta2014-04-051-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix sdk buildDeepanshu Gupta2014-04-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic08b57fdf2a653071a403bcc2c6b239a19363f72
* | | | | | | | Merge "Fix size_t format specifier"Michael Wright2014-04-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix size_t format specifierMichael Wright2014-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7d4ce5e0c7bb4d9e0cc19edf68f30f6b2b054bc7
* | | | | | | | | am 8e2a4b53: am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). ↵Nick Kralevich2014-04-040-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always." * commit '8e2a4b539509f03c4b3521574a910f2ea3296a66': Always call super.onCreate(). Always.
| * | | | | | | | am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always."Nick Kralevich2014-04-041-2/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ed27328b5e20d32b1e6ac5b39684dad3e737ca7': Always call super.onCreate(). Always.
| | * \ \ \ \ \ \ \ am dc97144b: Merge "Always call super.onCreate(). Always."Nick Kralevich2014-04-041-2/+4
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc97144b3f83bf6dae90493a6631afc6523dfce2': Always call super.onCreate(). Always.
| | | * \ \ \ \ \ \ \ Merge "Always call super.onCreate(). Always."Nick Kralevich2014-04-041-2/+4
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Always call super.onCreate(). Always.Christopher Tate2014-04-041-2/+4
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 12991134 (cherrypick of commit 9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a) Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
* | | | | | | | | | | PowerManager: Fix buildRuchi Kandoi2014-04-041-1/+7
| |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix build breaks by commit 667372e39bfe01bd15f0803d51ef0e9816f18808 Change-Id: I9e6e0f9146f860d27337cef0551c686ba2d60e23
* | | | | | | | | | am de4fedef: am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: ↵Katie McCormick2014-04-042-4/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | / / / / / / | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | notification bug fix." into klp-docs * commit 'de4fedefbf4772e15bb9aa95458fd2f314cdb502': Doc Update: notification bug fix.
| * | | | | | | | am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug ↵Katie McCormick2014-04-042-4/+6
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix." into klp-docs * commit '8e63696a73dfebae9b2ec123611db6b21968dbfd': Doc Update: notification bug fix.
| | * | | | | | | am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into ↵Katie McCormick2014-04-042-4/+6
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-docs * commit 'f7bffe7707f31da920a8ff08d013934562e9a43d': Doc Update: notification bug fix.
| | | * | | | | | am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docsKatie McCormick2014-04-042-4/+6
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'fc8ea92df15689d51079212d7d012756ce9298d2': Doc Update: notification bug fix.
| | | | * | | | | Merge "Doc Update: notification bug fix." into klp-docsKatie McCormick2014-04-042-4/+6
| | | | |\ \ \ \ \
| | | | | * | | | | Doc Update: notification bug fix.Katie McCormick2014-04-042-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: b/13429906 Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
* | | | | | | | | | Merge "Update to call new Skia APIs."Leon Scroggins2014-04-0414-141/+179
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update to call new Skia APIs.Leon Scroggins2014-04-0414-141/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I816129d49c0118453222916f3c818eccac33663d merges a new version of Skia that updates various APIs. Call the new ones. SkBitmap::copyTo now takes an SkColorType instead of an SkBitmap::Config, so do the conversion with SkBitmapConfigToColorType or use the enum when it makes sense. Call SkImageDecoder::decodeSubset instead of (deprecated) SkImageDecoder::decodeRegion. Override SkCanvas::ClipVisitor::clipRRect in ClipCopier. In Canvas::clip calls, call SkCanvas::isClipEmpty(), which was previously called inside the clip call, to determine the return value. For various SkPaint effects, call the new factories (as the constructors have been made protected). Implement SkJavaOutputStream::bytesWritten(), overriding a new pure virtual function on SkWStream. Update Matrix calls to always return true (since SkMatrix calls no longer return a value). Depends on I816129d49c0118453222916f3c818eccac33663d (skia). Change-Id: I5cdcea827ebff587df0bbddc0965e3e0fbf48002
* | | | | | | | | | | PowerManager: add powerHint methodRuchi Kandoi2014-04-043-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add powerHint method to IPowerManager for passing power hints from other processes. Change-Id: Ic596ace2ed1796a6da4cddb2163dcc4536115e55
* | | | | | | | | | | am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and ↵John Spurlock2014-04-049-8/+35
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qualifier." into klp-modular-dev * commit '642421aa7f284817cc1a972a7f9c7a64696a0116': Introduce new UI_MODE_TYPE_WATCH and qualifier.
| * | | | | | | | | | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into ↵John Spurlock2014-04-049-8/+35
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e': Introduce new UI_MODE_TYPE_WATCH and qualifier.
| | * | | | | | | | | Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-devJohn Spurlock2014-04-049-8/+35
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-049-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default ui mode to watch if we have FEATURE_WATCH. Bug:13395758 Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
* | | | | | | | | | | | Merge "Fix ActionBar attribute parsing"Adam Powell2014-04-042-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix ActionBar attribute parsingAdam Powell2014-04-042-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lost in some prior refactoring. Also fixes doc builds for the removed styleable. Change-Id: Ice27a978cd5c22c6ad1fc0b45557c6cac77b5985
* | | | | | | | | | | | | Tint more icons, fix dialog styles and headersAlan Viverette2014-04-04109-72/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 13795227 Change-Id: I4cf217748196512a5245468684246299205319f2
* | | | | | | | | | | | | Merge "DownloadManager test will wait until certain progress, is made during ↵Maxim Siniavine2014-04-042-19/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | download before moving to next stage of the test."
| * | | | | | | | | | | | | DownloadManager test will wait until certain progress, is madeMaxim Siniavine2014-04-032-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during download before moving to next stage of the test. Increase the timeout for waiting for download to complete. Change-Id: I61820a9525256f4f2e16571e1ac075d2f5268cae
* | | | | | | | | | | | | | am 8f81d295: am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added ↵Ricardo Cervera2014-04-041-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | / / / / / / / / | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs * commit '8f81d29558bb0c97187d5ae3a7ee696ec13b264a': docs: Added permissions note for Context.getFilesDir. Bug: 13716053
generated by cgit v1.1 at 2024-08-03 11:54:19 +0000