Jean-Michel Trivi
26bf4d9020
Merge "Optimize media button stack traversal for remote volume"
2013-01-11 11:30:30 -08:00
Fabrice Di Meglio
9003007d35
Merge "Fix Volume icons for RTL languages"
2013-01-11 11:10:00 -08:00
Jeff Sharkey
ab82e35a59
Merge "Examine widget hierarchy to find clocks."
2013-01-11 10:56:40 -08:00
Christopher Tate
3fef446a14
am ec64c30b: am cc52272b: am a3e79199: Merge "TIME_TICK was not occurred for one hour"
...
* commit 'ec64c30bfc221fea888efe5eac62f7c5303aeeb0':
TIME_TICK was not occurred for one hour
2013-01-11 10:54:46 -08:00
Satoshi Kataoka
9062fd8d55
am 50fc82fd: am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
...
* commit '50fc82fdf025bc1fee8f0eb50fa88e4591c8daae':
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
2013-01-11 10:54:31 -08:00
Sascha Prueter
b70d9df780
am 1ec3c2cc: am 28608bbb: am d692ea6d: am b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
...
* commit '1ec3c2ccedde5cd8ff6e94c9b1566a913d5e8db0':
Improve heuristics for detecting wireless chargers.
2013-01-11 10:53:49 -08:00
Adam Koch
1d6a7bd973
am c8eb3b41: am d6ddb51b: am 2d255b7e: am ec7ffa14: am 0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
...
* commit 'c8eb3b41d5ade3d0900d617d518a7b7b673a01ad':
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
2013-01-11 10:53:29 -08:00
Dianne Hackborn
885bfcd523
am 9e6575bc: am 854458f4: am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357 : Super lights out mode vs. volume dialog
...
* commit '9e6575bc52f421484fe262aff224db247e70d830':
Merge from master: fix issue #7966357 : Super lights out mode vs. volume dialog
2013-01-11 10:53:19 -08:00
Jeff Sharkey
06c5f8a768
Examine widget hierarchy to find clocks.
...
When switching to a widget, examine its hierarchy to determine if it
contains TextClocks that show hour and minute for the local timezone.
If so, hide the status bar clock. Doesn't fix closing walls.
Bug: 7667638
Change-Id: I1e2c40345c9e5eb0193efd70838c7ca9f779190b
2013-01-11 10:49:19 -08:00
Jonathan Dixon
c19b549752
Merge "Remove checkThread() in WebView.getFactory()"
2013-01-11 10:25:37 -08:00
Jonathan Dixon
a811c2f65c
Remove checkThread() in WebView.getFactory()
...
Bug: 7617139
WebViewFactoryProvider.getProvider() is thread safe, and when
called from findAddress() this is giving a spurious strict mode
warning.
Also removing obsolete comment while here.
Change-Id: I0b36bc23c13c9c9bec26edaf32ee83ade88982c8
2013-01-11 10:23:01 -08:00
Christopher Tate
ec64c30bfc
am cc52272b: am a3e79199: Merge "TIME_TICK was not occurred for one hour"
...
* commit 'cc52272b4fa27ab36ba20e22a53f872fedc8bb45':
TIME_TICK was not occurred for one hour
2013-01-11 08:58:34 -08:00
Adam Cohen
90a318aadc
Merge "Updating new widget api to account for view type count"
2013-01-10 19:24:11 -08:00
Adam Cohen
b00d9f0e07
Updating new widget api to account for view type count
...
Change-Id: Iab3a905aaec0b42ef31cd23e0711f6f7bf299486
2013-01-10 19:23:39 -08:00
Romain Guy
fff06e97e3
Merge "Add a new type of profiling graph: lines"
2013-01-10 18:41:37 -08:00
Romain Guy
48ef4a92a4
Add a new type of profiling graph: lines
...
Change-Id: I0e67d7227016fe37011e17d04220a200a6a5fba0
2013-01-10 18:38:46 -08:00
Christopher Tate
cc52272b4f
am a3e79199: Merge "TIME_TICK was not occurred for one hour"
...
* commit 'a3e7919932199e2178792cbae8870e9b48c57523':
TIME_TICK was not occurred for one hour
2013-01-10 18:26:50 -08:00
Satoshi Kataoka
50fc82fdf0
am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
...
* commit '30b074fcbff6263db4044ff4e8f36eb5d4e136eb':
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
2013-01-10 18:20:56 -08:00
Satoshi Kataoka
30b074fcbf
am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
...
* commit '2495d08a5c06556deb7c3993add337037b8b492e':
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
2013-01-10 18:17:35 -08:00
Satoshi Kataoka
2495d08a5c
am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
...
* commit '5327322ab94711a654d41a5b53be3bf6a3a28a39':
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
2013-01-10 18:15:11 -08:00
Satoshi Kataoka
5327322ab9
Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
2013-01-10 18:12:44 -08:00
Christopher Tate
a3e7919932
Merge "TIME_TICK was not occurred for one hour"
2013-01-10 17:39:33 -08:00
Craig Mautner
0bdb1e35ec
Merge "Call assignLayersLocked when InputMethod is moved."
2013-01-10 17:33:28 -08:00
Craig Mautner
b5eb550fb1
Call assignLayersLocked when InputMethod is moved.
...
Call was removed by over-ambitious editing in CL 259410.
Fixes bug 7966824.
Change-Id: I9feb2ec27907f4e03b9424710adc2743a8b512d8
2013-01-10 17:29:30 -08:00
Wink Saville
5a98f08182
Merge "Use readUnsignedByte."
2013-01-10 16:03:03 -08:00
Svetoslav Ganov
ea307734e7
Merge "Fixing a memory leak in ViewRootImpl and a focus change callback issue."
2013-01-10 15:45:38 -08:00
Adam Powell
e886d3d33b
am 79cc4a2a: am d1779207: am 0bf63a9a: am d29f2d26: Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev
...
* commit '79cc4a2ab0130acca83de5945a43adf9925beac1':
Make action bar title a valid touch target for up when relevant
2013-01-10 15:39:00 -08:00
Scott Main
96f4f52652
am b484f8e1: am 782b0f71: am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs
...
* commit 'b484f8e1a4f07e35a194ee43676da8eb4e9d50ef':
docs: a few doc bugs
2013-01-10 15:38:27 -08:00
Stephen Hines
bb469bde8d
Merge "Add parentheses for latest Clang warnings."
2013-01-10 15:23:49 -08:00
Stephen Hines
9be5f0a306
Add parentheses for latest Clang warnings.
...
Change-Id: I843fd3eb44e1ab0a177d7045ca97cf146fd81231
2013-01-10 15:09:02 -08:00
Scott Main
f8c8333f7d
am ccb2a74f: am 2b8603c2: am 8429f43b: am 7bcea4ae: am d149242a: docs: correct the url path to badge images and updated pr-br badge
...
* commit 'ccb2a74f360bf09ec2c91b28c15e0003a9af440a':
docs: correct the url path to badge images and updated pr-br badge
2013-01-10 14:51:56 -08:00
Scott Main
6f028480fa
am 8a05d13e: am 5b56d432: am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev
...
* commit '8a05d13ef656b0147d85e1826b70a55f6b32e1e3':
docs: resolve bugs from external tracker
2013-01-10 14:51:43 -08:00
Scott Main
ba6e54b454
am 3ccb33d5: am 4f8a160a: am f344e3c7: am 7ed49126: am 13ef4e43: docs: update GP badges with localized badges. includes AI files for all badges in available languages
...
* commit '3ccb33d5e08a0f444d16be894827dcbdfd0db42f':
docs: update GP badges with localized badges. includes AI files for all badges in available languages
2013-01-10 14:51:34 -08:00
Sascha Prueter
1ec3c2cced
am 28608bbb: am d692ea6d: am b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
...
* commit '28608bbb2fb6daf3d261cb10eaeb1849781cf77d':
Improve heuristics for detecting wireless chargers.
2013-01-10 11:19:20 -08:00
Sascha Prueter
28608bbb2f
am d692ea6d: am b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
...
* commit 'd692ea6dd297fbd39885525a29bdf6637a3640f2':
Improve heuristics for detecting wireless chargers.
2013-01-10 11:16:51 -08:00
Sascha Prueter
d692ea6dd2
am b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
...
* commit 'b5e4835e3a4ff37693891a59841fcefa5c3aa648':
Improve heuristics for detecting wireless chargers.
2013-01-10 11:14:53 -08:00
Sascha Prueter
b5e4835e3a
Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
2013-01-10 11:11:20 -08:00
Jeff Brown
3b971598ed
Improve heuristics for detecting wireless chargers.
...
On some devices, we need to apply heuristics to determine whether
the device is docked on a wireless charger because the charging
circuits do not provide sufficient information to know whether
the device is on the charger unless it is actually receiving
power.
The previous heuristics only considered the battery level to
suppress spurious dock signals.
The new heuristics also take into account whether the device
appears to have moved from its previous position on the dock.
Bug: 7744185
Change-Id: I5ba885dac25b37840b6db46b8a0f30968a06776c
2013-01-10 10:01:56 -08:00
Adam Koch
c8eb3b41d5
am d6ddb51b: am 2d255b7e: am ec7ffa14: am 0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
...
* commit 'd6ddb51b3d4ec1bb2e6305823681cdeb05c0ea7b':
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
2013-01-10 06:35:41 -08:00
Adam Koch
d6ddb51b3d
am 2d255b7e: am ec7ffa14: am 0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
...
* commit '2d255b7e1fb1cb1ceb64a962f672f145eab585e8':
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
2013-01-10 06:32:43 -08:00
Adam Koch
2d255b7e1f
am ec7ffa14: am 0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
...
* commit 'ec7ffa145572eae2566cb1c763bcf50d8d1e8d6b':
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
2013-01-10 06:30:30 -08:00
Adam Koch
ec7ffa1455
am 0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
...
* commit '0bb4dade30d3413cc7951c5d2c0ee761a93ae468':
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
2013-01-10 06:26:46 -08:00
Satoshi Kataoka
9d08143fa7
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
...
This reverts commit 32b812054cce27d1c70b53ba8ac729c7186b105e
Bug: 7976890
Change-Id: I75ab60734153719b199cf7281d23f5eb1ad2d1bc
2013-01-10 17:42:56 +09:00
Sungmin Choi
563914a9a1
TIME_TICK was not occurred for one hour
...
TIME_TICK was not occurred at the end of DST for one hour
Step to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time and Automatic time zone
3. select Time zone -> select Brussels
4. set date -> Oct. 28. 2012
5. set time -> 1:59 AM
Bug: 7922117
Change-Id: I2e78bd97b508d6a38471425cfbaca45fb4b89c1e
2013-01-10 17:33:26 +09:00
Romain Guy
14e066df1c
Merge "Clarify javadoc and parameter names Bug #7978741 "
2013-01-09 20:18:35 -08:00
Romain Guy
9c5d1b17bf
Clarify javadoc and parameter names
...
Bug #7978741
Change-Id: If713e2e58524ace008797abc142f50b83bfa3c61
2013-01-09 20:16:37 -08:00
Dianne Hackborn
9e6575bc52
am 854458f4: am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357 : Super lights out mode vs. volume dialog
...
* commit '854458f4d52937f9a1385559d759bd8019eb3294':
Merge from master: fix issue #7966357 : Super lights out mode vs. volume dialog
2013-01-09 19:01:26 -08:00
Dianne Hackborn
854458f4d5
am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357 : Super lights out mode vs. volume dialog
...
* commit '0287ca3ca36ad98004ddabfa189105e6324a820e':
Merge from master: fix issue #7966357 : Super lights out mode vs. volume dialog
2013-01-09 19:00:06 -08:00
Dianne Hackborn
0287ca3ca3
am e62fa825: Merge from master: fix issue #7966357 : Super lights out mode vs. volume dialog
...
* commit 'e62fa825794967c2067be86e8b57b83f4b82ee1c':
Merge from master: fix issue #7966357 : Super lights out mode vs. volume dialog
2013-01-09 18:58:07 -08:00
Dianne Hackborn
e62fa82579
Merge from master: fix issue #7966357 : Super lights out mode vs. volume dialog
...
The volume panel now forces us out of the UI modes while it
is up.
Change-Id: If39fa33b1c52579bf5d376ce4722408cee3ca951
2013-01-09 18:51:51 -08:00