Scott Main
a180cc3c0c
am cd579c57: wording tweak to brand guidelines
...
* commit 'cd579c57bb7bce23736216905dc2c0a349bf4246':
wording tweak to brand guidelines
2012-10-01 12:00:24 -07:00
Jeff Brown
9370592e23
am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
...
* commit '5d359a92658d01b0220f77eb294d6124848739bc':
Remove clearUserActivityTimeout().
2012-10-01 11:41:11 -07:00
Jeff Brown
5d359a9265
am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
...
* commit '5e3dcf7210bed65d8f9aec40d9da078daf76dead':
Remove clearUserActivityTimeout().
2012-10-01 11:39:30 -07:00
Jeff Brown
5e3dcf7210
Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
2012-10-01 11:35:55 -07:00
Amith Yamasani
e98bde011c
Fix broadcast to a specific user
...
Bug: 7255777
Bug: 7263657
When userId is neither CURRENT nor ALL, the correct list of receivers
was not being built, due to a typo in ActivityManagerService;
Change-Id: Ib1dc627f0dbd1c91d02c718d2e4d2384ad687d1f
2012-10-01 11:30:47 -07:00
Amith Yamasani
54289b8b4a
Fix cache deletion for secondary users
...
Bug: 7249419
Change-Id: Idbc0f9994508059ebf5055aea961b87e08b3673a
2012-10-01 11:19:55 -07:00
Scott Main
cd579c57bb
wording tweak to brand guidelines
...
Change-Id: Ie1435ac97b6988b74fbcd1e1b29e4ff106492a13
2012-10-01 11:17:54 -07:00
Adam Powell
586439676f
am 21a80ff4: am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
...
* commit '21a80ff4d1a557d8e33f86a218d204c0093fefc7':
Construct a task stack for picking a wifi network from notification
2012-10-01 10:36:48 -07:00
Adam Powell
21a80ff4d1
am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
...
* commit 'c56e5600501a5c376dc13e6a99fcec7782fc8718':
Construct a task stack for picking a wifi network from notification
2012-10-01 10:34:59 -07:00
Adam Powell
c56e560050
Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
2012-10-01 10:32:35 -07:00
Daniel Sandler
3c367cd496
am 0cfda91b: am bfbf6e12: Merge "Fix IME tile related crash" into jb-mr1-dev
...
* commit '0cfda91b918a22d8f12775568dfaf7de1efc817b':
Fix IME tile related crash
2012-10-01 10:24:09 -07:00
John Spurlock
e58fc04f7c
am db3b01a5: am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev
...
* commit 'db3b01a5bfbf5e190bf6116b71e27971c3b5816b':
Status bar: Keep disabled state per user.
2012-10-01 10:24:05 -07:00
Baligh Uddin
b66dd39efa
am 40aca083: am b5174cc2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '40aca0832394b30a045c47e71deb1bd37ffdf6d5':
Import translations. DO NOT MERGE
2012-10-01 10:24:02 -07:00
Daniel Sandler
1b12a27819
am 0f78437e: am 17d5f47e: Merge "Remove IME tile from Quick Settings." into jb-mr1-dev
...
* commit '0f78437ef80224f3d60cae7db3fcda111dfa40fa':
Remove IME tile from Quick Settings.
2012-10-01 10:23:59 -07:00
Baligh Uddin
383aaf4e95
am 7d9c7a24: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '7d9c7a2436533157c84dd0cbfd5bfd9d1f334300':
Import translations. DO NOT MERGE
2012-10-01 10:17:21 -07:00
Daniel Sandler
b35ca25c06
am 10b49cce: am 79eda11f: Merge "Assets were drawn in the wrong timezone." into jb-mr1-dev
...
* commit '10b49cce8727efb1238e8ec4f4a74072aec8cc4f':
Assets were drawn in the wrong timezone.
2012-10-01 10:17:18 -07:00
Alan Smithee
9970118485
am 7689edd5: am 0a00cfdb: Merge "Tapping the clock now takes you to date/time settings." into jb-mr1-dev
...
* commit '7689edd5210198352bebf335711070a1d3d43b58':
Tapping the clock now takes you to date/time settings.
2012-10-01 10:17:14 -07:00
Satoshi Kataoka
6ce84e681e
am c97fa8f8: am 135e5fb7: Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
...
* commit 'c97fa8f8a02f1850779cc1e6ff6b67bcdbeecb1b':
Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
2012-10-01 10:17:05 -07:00
Irfan Sheriff
29fce0caec
am e6f9f2a8: am bdac829f: Merge "Make rssi state change sticky" into jb-mr1-dev
...
* commit 'e6f9f2a8a39791922d0e7125ef2a59772a57ce0e':
Make rssi state change sticky
2012-10-01 10:16:44 -07:00
Jeff Sharkey
1586c228f7
am f138e3ce: am 71520a68: Merge "Handle ISE when physical volume isn\'t mounted." into jb-mr1-dev
...
* commit 'f138e3cec9aa6b86a0e614a39ed29f0709ebfabd':
Handle ISE when physical volume isn't mounted.
2012-10-01 10:16:35 -07:00
Chet Haase
1dd002214e
am bcdaf8cb: am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev
...
* commit 'bcdaf8cb6d75d721507739504732e0e3dc7f437c':
Fix texture corruption
2012-10-01 10:16:25 -07:00
Dianne Hackborn
3645f2ccde
am 55241249: am 2a30547a: Merge "Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
...
* commit '552412496c00c04c9af353785936a89743677d49':
Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest...
2012-10-01 10:16:22 -07:00
rich cannings
fdd8a81015
am 60000916: am 2b58c1b5: Merge "Disable package verification in test harness" into jb-mr1-dev
...
* commit '6000091663200e8846f418db99f2b4618cc6a294':
Disable package verification in test harness
2012-10-01 10:16:14 -07:00
Adam Cohen
df1d4c44f7
am bc0b4313: am 2032a120: Merge "Making runway lights appear for correct pages (issue 7232481)" into jb-mr1-dev
...
* commit 'bc0b4313a98b8584a939a5087689117d9ffd1966':
Making runway lights appear for correct pages (issue 7232481)
2012-10-01 10:16:10 -07:00
Adam Powell
5f260236ed
am 135ce20c: am fb42be77: Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev
...
* commit '135ce20c12ef869028aa7d0182960f92840b7cfc':
Fix UNSPECIFIED measurement in RelativeLayout
2012-10-01 10:16:03 -07:00
Adam Cohen
efeb7c86b7
am 21ec73d7: am 933a7546: Fix build
...
* commit '21ec73d7faafe007706aebb6a10655caa393bf72':
Fix build
2012-10-01 10:15:38 -07:00
Dianne Hackborn
eede0f6fe0
am b4bca666: am 2effc77c: Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev
...
* commit 'b4bca6661784ab8087e382765c2e0d53e98d651f':
Update APIs to JB MR1 level 17.
2012-10-01 10:15:27 -07:00
Adam Cohen
c00a311b30
am 6d9c3992: am 0a5bc222: Merge "Integrate keyguard paging hint" into jb-mr1-dev
...
* commit '6d9c3992defced0c0f2779576a10957f7d42c7ff':
Integrate keyguard paging hint
2012-10-01 10:15:22 -07:00
Adam Cohen
2e16cf67c1
am e1430669: am b97a71e8: Merge "Getting rid of keyguard widget flag that isn\'t used" into jb-mr1-dev
...
* commit 'e14306690096fc3a1ae78f411ba9a7b616224df7':
Getting rid of keyguard widget flag that isn't used
2012-10-01 10:15:17 -07:00
Craig Mautner
7b9a263b50
am 61d32c0d: am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev
...
* commit '61d32c0d0f05a394129e03d774589b8d93f5f8fb':
Changing debug for b/7094175.
2012-10-01 10:15:05 -07:00
Fabrice Di Meglio
6065c73e9f
am 1a2fd69a: am ce75fef7: Merge "Fix the build" into jb-mr1-dev
...
* commit '1a2fd69a1b53b990518c73b85e434fd5d08a92f4':
Fix the build
2012-10-01 10:14:53 -07:00
Fabrice Di Meglio
e05c172638
am 3332a701: am 10c84edc: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
...
* commit '3332a701e1cd6453089d7b0c6501c7f37cb69327':
Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
2012-10-01 10:14:47 -07:00
Romain Guy
d49faf39ec
am 25c8c198: am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930 " into jb-mr1-dev
...
* commit '25c8c198e6abc053fbba19145ed485e31dc5927e':
Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
2012-10-01 10:14:40 -07:00
Romain Guy
b9a0a23111
am dd2dd7bb: am 955b66d0: Merge "reset() should reset. Otherwise it would be called something else. Bug #7256095 " into jb-mr1-dev
...
* commit 'dd2dd7bbb0cac897db9406f7271689e36397b80e':
reset() should reset. Otherwise it would be called something else. Bug #7256095
2012-10-01 10:14:37 -07:00
Fabrice Di Meglio
840ea01fcb
am 93cea34a: am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit '93cea34a7f7834f42f921402415f7797b677e442':
Fix bug #6427629 Clean up layout direction APIs
2012-10-01 10:14:31 -07:00
Baligh Uddin
e4fc679d57
am c4e7719c: am ce803d8e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c4e7719c3253074bb06777c41649ec8ff7c50302':
Import translations. DO NOT MERGE
2012-10-01 10:14:23 -07:00
Svetoslav Ganov
798af86dcc
am 82e21b33: am 9ea8f390: Explore by touch enabled when screen magnification is on.
...
* commit '82e21b33bde057ba21dde9ee2023d785b4b5a757':
Explore by touch enabled when screen magnification is on.
2012-10-01 10:14:19 -07:00
Mike Cleron
25bc59dd08
am eb43858e: am a995b6e3: Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev
...
* commit 'eb43858ea041dcb61b2de94f8fa9d069be5fc93c':
Getting rid of blue outline in user switcher, instead brighten the user
2012-10-01 10:13:58 -07:00
Jeff Brown
843b014aca
am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
...
* commit '489c1e9f82250770004ec9080778546b040f6146':
Get rid of preventScreenOn().
2012-10-01 10:13:52 -07:00
Jatin Lodhia
6c7169722f
am bf07c7a9: am 7c3586c5: Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev
...
* commit 'bf07c7a93f7d8ae2d67eecf98ad76e60212e161b':
Make the theme for choose account and choose account type dialogs same.
2012-10-01 10:13:47 -07:00
Jim Miller
7b439a0e11
am 7b4386c6: am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev
...
* commit '7b4386c6177c874208f7f221787fca9079d2b7c4':
Clean up SIM PIN and PUK screens in keyguard.
2012-10-01 10:13:43 -07:00
Irfan Sheriff
97a59e3be1
am bccfd5f2: am d3081bc9: Merge "Revert setting GO idle time out" into jb-mr1-dev
...
* commit 'bccfd5f2dc0674ee8ae3c2fbf1482843393f72d6':
Revert setting GO idle time out
2012-10-01 10:13:34 -07:00
Dianne Hackborn
d698542867
am 66e92752: am 84215565: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '66e92752260e4ef21e77a44379f3a6b8969b4d65':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-10-01 10:13:25 -07:00
Daniel Sandler
0cfda91b91
am bfbf6e12: Merge "Fix IME tile related crash" into jb-mr1-dev
...
* commit 'bfbf6e1232013a999f4776f7fdf7cf6fb577f89b':
Fix IME tile related crash
2012-10-01 10:13:17 -07:00
John Spurlock
db3b01a5bf
am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev
...
* commit 'ff70848eb2a6b916ad2ad2ceec0c59bcb41373a2':
Status bar: Keep disabled state per user.
2012-10-01 10:13:14 -07:00
Svetoslav Ganov
8173646ea4
am 45cde607: am c5211780: Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
...
* commit '45cde607d5c6dfe39675a12d3bc47a0bc74565a2':
Sending interaction end event at the end of a drag.
2012-10-01 10:13:12 -07:00
Baligh Uddin
40aca08323
am b5174cc2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b5174cc2cf4345d51be86ec803f05163c2c9b2d8':
Import translations. DO NOT MERGE
2012-10-01 10:13:03 -07:00
Daniel Sandler
0f78437ef8
am 17d5f47e: Merge "Remove IME tile from Quick Settings." into jb-mr1-dev
...
* commit '17d5f47e5a1deb9a4fa09aee444a28ec3d1b1687':
Remove IME tile from Quick Settings.
2012-10-01 10:12:44 -07:00
Daniel Sandler
bfbf6e1232
Merge "Fix IME tile related crash" into jb-mr1-dev
2012-10-01 10:00:40 -07:00
Daniel Sandler
aca0c757e6
Fix IME tile related crash
...
Bug: 7246375
Change-Id: I374ed201ea4870fb7397d075baed09524061030d
2012-10-01 12:59:36 -04:00