Baligh Uddin
fd6b66020b
am fb6cea75
: (-s ours) am b1055311
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'fb6cea755cb61ba20298ba0c5935f83cb385fdf2':
Import translations. DO NOT MERGE
2012-09-24 09:33:48 -07:00
Baligh Uddin
84964f1259
am dea83bdd
: am 17b7a8cd
: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
...
* commit 'dea83bdd138e083e2d3207ae9e52bc5f73a57e82':
Remove no longer used dream_settings.xml.
2012-09-24 09:33:47 -07:00
Romain Guy
9a38e484e7
am 4be0fe59
: am 70edd393
: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
...
* commit '4be0fe59d9c9c61acc248464957dcd2e9f18abca':
Add new developer setting to visualize overdraw
2012-09-24 09:33:46 -07:00
Svetoslav Ganov
7253131c04
am dd381701
: am f85e7e15
: Merge "Accessibility multi-user support." into jb-mr1-dev
...
* commit 'dd381701db67697ac8ccd5e2d01aeba2ff92cbcd':
Accessibility multi-user support.
2012-09-24 09:33:44 -07:00
Baligh Uddin
fb6cea755c
am b1055311
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b105531116148d5d29e113e611ac180aa9691c6e':
Import translations. DO NOT MERGE
2012-09-24 09:25:58 -07:00
Baligh Uddin
dea83bdd13
am 17b7a8cd
: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
...
* commit '17b7a8cd1895871441c86afef5387acfa3b81b57':
Remove no longer used dream_settings.xml.
2012-09-24 09:25:57 -07:00
Romain Guy
4be0fe59d9
am 70edd393
: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
...
* commit '70edd393bf6590647c12808e20efa928eba96705':
Add new developer setting to visualize overdraw
2012-09-24 09:25:56 -07:00
Svetoslav Ganov
dd381701db
am f85e7e15
: Merge "Accessibility multi-user support." into jb-mr1-dev
...
* commit 'f85e7e15a75d5a475e10940e1b3d570210729b64':
Accessibility multi-user support.
2012-09-24 09:25:55 -07:00
Svetoslav Ganov
29dd06463a
am 1bd69f9a
: am 0a48c169
: Merge "Remove accessibility category from developer options." into jb-mr1-dev
...
* commit '1bd69f9abab775ec1aceee53153c3a7e5aa329ec':
Remove accessibility category from developer options.
2012-09-24 00:52:10 -07:00
Dianne Hackborn
d592ce2974
am 3fea2123
: am f4bd1a70
: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
...
* commit '3fea2123960fd7d0f2d766f16a8bdb69e570355a':
Fix issue 7198767, 7198366, 7189824.
2012-09-24 00:52:04 -07:00
Baligh Uddin
81cace918c
am e6bb67f8
: (-s ours) am 936186c6
: Revert "Import translations. DO NOT MERGE"
...
* commit 'e6bb67f811eac5dcc93f417a2eade0a6d4905abf':
Revert "Import translations. DO NOT MERGE"
2012-09-24 00:51:49 -07:00
Baligh Uddin
9d43b57610
am fb7cb4d3
: (-s ours) am 8172ea49
: Import translations. DO NOT MERGE
...
* commit 'fb7cb4d3ddeb6d4250cd4d02d05a705030b0dc21':
Import translations. DO NOT MERGE
2012-09-24 00:51:22 -07:00
Baligh Uddin
b105531116
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-23 08:14:05 -07:00
Baligh Uddin
17b7a8cd18
Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
2012-09-23 08:13:38 -07:00
Baligh Uddin
53090255c2
Import translations. DO NOT MERGE
...
Change-Id: I24f5f103806bd5012567cf50060af86aa1fc53c6
Auto-generated-cl: translation import
2012-09-22 14:22:58 -07:00
Baligh Uddin
9307c8e9f9
Import translations. DO NOT MERGE
...
Change-Id: Ie4f6419929f793550859314eb624135452f845f4
Auto-generated-cl: translation import
2012-09-22 14:20:39 -07:00
John Spurlock
1ce93065a5
Remove no longer used dream_settings.xml.
...
Change-Id: I8355372f4dd2f99a92b4a708cf38276c5e7f41d4
2012-09-22 10:38:43 -04:00
Romain Guy
70edd393bf
Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
2012-09-21 19:28:12 -07:00
Romain Guy
098f493dba
Add new developer setting to visualize overdraw
...
Change-Id: I16d6bb5a199233efebf5c3211dbe57dc9b6729c9
2012-09-21 19:23:20 -07:00
Svetoslav Ganov
f85e7e15a7
Merge "Accessibility multi-user support." into jb-mr1-dev
2012-09-21 17:41:31 -07:00
Svetoslav Ganov
46045d8b12
Accessibility multi-user support.
...
1. Accessibility settings are now shown for every user.
bug:6967373
Change-Id: Ie31a6a573031bde1d769e43c4d5d88b7e4c8525d
2012-09-21 17:25:46 -07:00
Svetoslav Ganov
1bd69f9aba
am 0a48c169
: Merge "Remove accessibility category from developer options." into jb-mr1-dev
...
* commit '0a48c1690bd0aa7901e8fc737ca9e4dadec22ea4':
Remove accessibility category from developer options.
2012-09-21 17:15:42 -07:00
Svetoslav Ganov
0a48c1690b
Merge "Remove accessibility category from developer options." into jb-mr1-dev
2012-09-21 17:12:08 -07:00
Dianne Hackborn
3fea212396
am f4bd1a70
: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
...
* commit 'f4bd1a705f6b4e1e575c46f88ca91c02144e551e':
Fix issue 7198767, 7198366, 7189824.
2012-09-21 17:07:09 -07:00
Dianne Hackborn
f4bd1a705f
Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
2012-09-21 17:05:23 -07:00
Dianne Hackborn
c715fb1207
Fix issue 7198767, 7198366, 7189824.
...
Bug #7198767 : Crash on choosing App info from the Recent apps tab
Bug #7198366 : Settings UI should not show other Users' apps
Bug #7189824 : Settings crashes on trying to access Battery usage summary
Also fix running services to be able to show user bitmap when in
secondary users, crash in running services if a service is running
whose app is not installed for the current user.
Change-Id: Ief24810c9ddce1ec3f8641ce08af79e1bc18f221
2012-09-21 17:02:22 -07:00
Baligh Uddin
e6bb67f811
am 936186c6
: Revert "Import translations. DO NOT MERGE"
...
* commit '936186c614903f79cc562c005801f95863cbe054':
Revert "Import translations. DO NOT MERGE"
2012-09-21 16:37:25 -07:00
Baligh Uddin
936186c614
Revert "Import translations. DO NOT MERGE"
...
Build Broken
This reverts commit 8172ea490f
Change-Id: I091c3300ecce597bb0133f62bc621f29af85e5ba
2012-09-21 16:35:05 -07:00
Baligh Uddin
fb7cb4d3dd
am 8172ea49
: Import translations. DO NOT MERGE
...
* commit '8172ea490f5880b1e2df2856364c3d37c28ed155':
Import translations. DO NOT MERGE
2012-09-21 16:13:01 -07:00
Baligh Uddin
2b9b957003
Import translations. DO NOT MERGE
...
Change-Id: I080c6d857c61332eb79644ce5d3085c5d39dd78c
Auto-generated-cl: translation import
2012-09-21 15:51:22 -07:00
Baligh Uddin
8172ea490f
Import translations. DO NOT MERGE
...
Change-Id: Iae4b42c08cd2e16f700c844579fcb9b1664a2960
Auto-generated-cl: translation import
2012-09-21 15:48:35 -07:00
Michael Jurka
f66c3603fe
am cbf5be09
: am 406b01f4
: Merge "Add support for changing status widget on security screen" into jb-mr1-dev
...
* commit 'cbf5be09b072a7caa7558a30cfdf5cf1d584dc84':
Add support for changing status widget on security screen
2012-09-21 01:15:29 -07:00
Michael Jurka
cbf5be09b0
am 406b01f4
: Merge "Add support for changing status widget on security screen" into jb-mr1-dev
...
* commit '406b01f4ffe61f21a7fbaadac3e2a37a58eb2e2e':
Add support for changing status widget on security screen
2012-09-21 01:13:11 -07:00
Michael Jurka
406b01f4ff
Merge "Add support for changing status widget on security screen" into jb-mr1-dev
2012-09-21 01:11:00 -07:00
Michael Jurka
091477b4de
Add support for changing status widget on security screen
...
Change-Id: I68a8ce2ce03888a8decbe017d67634c6965f0a1a
2012-09-21 01:01:39 -07:00
Amith Yamasani
816ef1db92
am 10e59b1c
: am e4f249bb
: Merge "Exclude dying users when querying the list" into jb-mr1-dev
...
* commit '10e59b1c6e4d381d5ea8f653ab191eb41d31c026':
Exclude dying users when querying the list
2012-09-20 23:13:18 -07:00
Amith Yamasani
10e59b1c6e
am e4f249bb
: Merge "Exclude dying users when querying the list" into jb-mr1-dev
...
* commit 'e4f249bb7a9f999633d938d0c519631764bf969c':
Exclude dying users when querying the list
2012-09-20 23:11:00 -07:00
Amith Yamasani
e4f249bb7a
Merge "Exclude dying users when querying the list" into jb-mr1-dev
2012-09-20 23:09:21 -07:00
Amith Yamasani
e278eda851
Exclude dying users when querying the list
...
Bug: 7194894
Use the new API in UserManager to query the list of users, excluding
the dying ones.
Change-Id: Ib09bb723209030da7e8aca53d402ef4c96c273a3
2012-09-20 22:44:48 -07:00
Fabrice Di Meglio
e9863c9144
am 38dd190c
: am 377ab9c2
: Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
...
* commit '38dd190c9811eccc8a65a7acde043dd6b37cbf80':
Fix bug #7198585 Settings > Display > Dream completely broken in RTL
2012-09-20 20:31:12 -07:00
Fabrice Di Meglio
38dd190c98
am 377ab9c2
: Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
...
* commit '377ab9c2e42f90976f4af7eb362210fb2c409f7a':
Fix bug #7198585 Settings > Display > Dream completely broken in RTL
2012-09-20 20:22:54 -07:00
Svetoslav Ganov
43af40be48
Remove accessibility category from developer options.
...
1. There is a temporary accessibility option in developer options with
one item for enabling automatic zoom out and panning. This is not a
developer option in general and should not be there.
bug:7207305
Change-Id: Ib146ccb3704dd94d635cc668b71c007fbd8d29b3
2012-09-20 19:15:33 -07:00
Fabrice Di Meglio
377ab9c2e4
Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
2012-09-20 16:52:59 -07:00
Fabrice Di Meglio
ecadb07b4c
Fix bug #7198585 Settings > Display > Dream completely broken in RTL
...
- use start/end instead of left/right
- use android:textDirection="locale" on the TextView for forcing the
correct position of the title text
Change-Id: I968798dcd4ac9307ffc3e48369990b73d3d1b4db
2012-09-20 15:30:49 -07:00
The Android Open Source Project
bd001f41f7
am a9ac2a46
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a9ac2a46d1c718cfbe5e15bb1ad78217e236417f':
Fix NPE in DeviceInfoSettings
Fix a crash in InstalledAppDetails
Tweaking mechanism for adding keyguard widgets
Fix issue #7178865 : Selecting an app from Settings > Apps>...
Must initialize the new atomic..
Fix crash in Settings > Security
2012-09-20 12:49:00 -07:00
The Android Open Source Project
a9ac2a46d1
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2692af987f16852c90fa0826367700862c6ea23b
2012-09-20 10:37:00 -07:00
The Android Automerger
28cbc338b1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-20 07:00:29 -07:00
Jeff Brown
13d7c56a82
am cf0c0089
: am 9e143f5e
: First draft of wifi display settings UI.
...
* commit 'cf0c0089c68b45d14e897cf86aecd781b07df049':
First draft of wifi display settings UI.
2012-09-20 06:18:45 -07:00
Jeff Sharkey
9bfcdaaf8c
am b4923465
: am 99340f36
: Merge "Update string to reflect removed users." into jb-mr1-dev
...
* commit 'b4923465f8397e16bf49f478853436c0641ed774':
Update string to reflect removed users.
2012-09-20 06:18:44 -07:00
Brian Muramatsu
bcbfba66c4
am 29200053
: am 801a1588
: Merge "Fix regulatory information dialog appearance" into jb-mr1-dev
...
* commit '29200053d654d98a4f283da64b4e65e4a2364185':
Fix regulatory information dialog appearance
2012-09-20 06:18:42 -07:00