Russell Brenner
5a0d9e265c
am 8828a1b0
: am d13e3396
: Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev
...
* commit '8828a1b0eb169117686303a598fdb8fd19a46db1':
Pass flag to indicate multiple users on device
2012-10-02 17:21:51 -07:00
Russell Brenner
8828a1b0eb
am d13e3396
: Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev
...
* commit 'd13e3396852b4a98c46f2fc02d7a81dcdc1ab7f5':
Pass flag to indicate multiple users on device
2012-10-02 17:19:30 -07:00
Russell Brenner
d13e339685
Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev
2012-10-02 17:18:00 -07:00
alanv
364082e355
Add a11y content descriptions and label mapping to Dreams.
...
Also makes the radio button non-focusable and non-clickable, since
focus and click are handled by its list item container. Clicking on
top of the radio button still works as intended.
Bug: 7230372
Change-Id: I0f311160b09402d882c9d35fdb51e8f19c60f522
2012-10-02 17:16:18 -07:00
Amith Yamasani
c861cf8447
Improved dialog management in Settings>Users
...
Bug: 7266284 Delete not functional after orientation change
Bug: 7266182 Set up now not functional after orientation change
Also remove "vibrate when ringing" on tablets
Bug: 7253081
Change-Id: Ie616747f2e3292c401613eb2041b5a5a289cde20
2012-10-02 14:51:46 -07:00
Jeff Sharkey
cf0264521c
am 3b8ca450
: am d8d8a200
: am 6258a0e2
: Merge "Migrate telephony settings to Global." into jb-mr1-dev
...
* commit '3b8ca4505cdaffb7168032766027e7b907b2a4b0':
Migrate telephony settings to Global.
2012-10-02 14:05:36 -07:00
Jeff Sharkey
3b8ca4505c
am d8d8a200
: am 6258a0e2
: Merge "Migrate telephony settings to Global." into jb-mr1-dev
...
* commit 'd8d8a2002aaf791285cd68368dba010c65a6743b':
Migrate telephony settings to Global.
2012-10-02 14:02:21 -07:00
Jeff Sharkey
d8d8a2002a
am 6258a0e2
: Merge "Migrate telephony settings to Global." into jb-mr1-dev
...
* commit '6258a0e22ed82f8fcc80e50ffda058ebcaf177e1':
Migrate telephony settings to Global.
2012-10-02 14:00:18 -07:00
Jeff Sharkey
6258a0e22e
Merge "Migrate telephony settings to Global." into jb-mr1-dev
2012-10-02 13:58:00 -07:00
Daniel Sandler
28716d5127
am 0d166c3f
: am f94b8de1
: am 42312b47
: Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
...
* commit '0d166c3fc96f3c2e837d6d0b1b5a0f2948e0b901':
Support new ACTION_QUICK_CLOCK.
2012-10-02 10:59:11 -07:00
Daniel Sandler
0d166c3fc9
am f94b8de1
: am 42312b47
: Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
...
* commit 'f94b8de1cdd0f149f5abd11177ce4a59ff7db0c1':
Support new ACTION_QUICK_CLOCK.
2012-10-02 10:56:25 -07:00
Russell Brenner
84d04c2053
Pass flag to indicate multiple users on device
...
When creating a new account, some informational text changes when
more than one user exists on the device. Because GLS is built with
the SDK and because there is no public API to indicate this state,
a flag is added to the bundle passed to the AccountManager, which
then funnels down to GLS.
Bug: 7255673
Change-Id: Ida2aa5f70ab308958de510a95194463c2a089182
2012-10-02 10:56:24 -07:00
Daniel Sandler
f94b8de1cd
am 42312b47
: Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
...
* commit '42312b47926809a7042e2db5aec945417e11f53f':
Support new ACTION_QUICK_CLOCK.
2012-10-02 10:53:02 -07:00
Daniel Sandler
42312b4792
Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
2012-10-02 10:49:52 -07:00
The Android Open Source Project
09e46e6936
am 81a3dfd4
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '81a3dfd4e33c318769f29cf3eb7e00a42c2d1ecc':
Show warnings when skipping Wi-Fi connection
2012-10-02 09:24:46 -07:00
The Android Open Source Project
81a3dfd4e3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I31f2c7e4ec4673e7b360ba4abc94b4138cb135d8
2012-10-02 09:20:26 -07:00
Chris Wren
b982cc96ec
am e4fd2b45
: am 5ed6f3ce
: am 23a5fbbd
: renaming Sleep Mode feature.
...
* commit 'e4fd2b453384a9dd61cf18ef730c0bde01e4bcf0':
renaming Sleep Mode feature.
2012-10-02 08:53:10 -07:00
Chris Wren
e4fd2b4533
am 5ed6f3ce
: am 23a5fbbd
: renaming Sleep Mode feature.
...
* commit '5ed6f3ce4ad26577135c42e28177df32eaaf33a3':
renaming Sleep Mode feature.
2012-10-02 08:51:54 -07:00
Chris Wren
5ed6f3ce4a
am 23a5fbbd
: renaming Sleep Mode feature.
...
* commit '23a5fbbdf4c0b4bb815fff69a20598dcb3588080':
renaming Sleep Mode feature.
2012-10-02 08:50:30 -07:00
Chris Wren
23a5fbbdf4
renaming Sleep Mode feature.
...
Bug: 7212796
Bug: 7267485
Change-Id: I28b94bc53d7bf1bac4d7d1de6e6ed74c850ff8c3
2012-10-02 10:57:16 -04:00
The Android Automerger
b1e4cd3abb
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-02 07:00:11 -07:00
Baligh Uddin
7445ffa5ec
am 1de80610
: (-s ours) am 2765d3b7
: am 1e230b40
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '1de806100dff16e51beac5228530055e5292c1b6':
Import translations. DO NOT MERGE
2012-10-01 23:39:29 -07:00
Svetoslav Ganov
ba6918cc2a
am 0956ea79
: am b5d735f1
: am f26263fd
: Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
...
* commit '0956ea79a2a74213bdf09a3a03daad3ad879fe6f':
Upading the strings for accessibility multi-user.
2012-10-01 23:39:28 -07:00
Baligh Uddin
1de806100d
am 2765d3b7
: am 1e230b40
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2765d3b7658ac3dcb455628fab41479fe4fb24cb':
Import translations. DO NOT MERGE
2012-10-01 23:35:57 -07:00
Svetoslav Ganov
0956ea79a2
am b5d735f1
: am f26263fd
: Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
...
* commit 'b5d735f11085ae85ad768af03972809f444e1b0b':
Upading the strings for accessibility multi-user.
2012-10-01 23:35:55 -07:00
Baligh Uddin
47c1f66e4f
am 4c9ff65e
: (-s ours) am 90fd08b8
: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '4c9ff65e963cca3078edec623a05968e222c5dc3':
Import translations. DO NOT MERGE
2012-10-01 23:33:45 -07:00
Baligh Uddin
2765d3b765
am 1e230b40
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '1e230b4087cc923ab756d09a00eb754874f6bf92':
Import translations. DO NOT MERGE
2012-10-01 23:32:51 -07:00
Svetoslav Ganov
b5d735f110
am f26263fd
: Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
...
* commit 'f26263fdb7a639fe5de49e8f01576e8d4c6be7f6':
Upading the strings for accessibility multi-user.
2012-10-01 23:32:49 -07:00
Baligh Uddin
4c9ff65e96
am 90fd08b8
: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '90fd08b8ec5570017fdae958b97d42675a75c2ee':
Import translations. DO NOT MERGE
2012-10-01 23:31:24 -07:00
Baligh Uddin
90fd08b8ec
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-01 22:22:38 -07:00
Baligh Uddin
65c75e61ab
Merge "Import translations. DO NOT MERGE"
2012-10-01 22:21:49 -07:00
Baligh Uddin
1e230b4087
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-01 22:20:28 -07:00
Svetoslav Ganov
f26263fdb7
Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
2012-10-01 21:17:19 -07:00
Svetoslav Ganov
26a6df0877
Upading the strings for accessibility multi-user.
...
bug:7255486
Change-Id: I775165896124a6fde3684d0f302a90396ce19d2e
2012-10-01 18:42:11 -07:00
Baligh Uddin
69f3291324
Import translations. DO NOT MERGE
...
Change-Id: I829878e37bf9e8bc5ad842e03e22f5e548d33df9
Auto-generated-cl: translation import
2012-10-01 15:36:50 -07:00
Baligh Uddin
dd524738a2
Import translations. DO NOT MERGE
...
Change-Id: I117727baf42a812b608c5931ad76cf9f70ff0c9e
Auto-generated-cl: translation import
2012-10-01 15:34:23 -07:00
Baligh Uddin
013d704b9d
Import translations. DO NOT MERGE
...
Change-Id: I576f2a4c47da5f4796042ffacfaa6cc3835e8075
Auto-generated-cl: translation import
2012-10-01 15:32:43 -07:00
Adam Powell
78dd2ef982
am 39dfa34e
: am d7be24f6
: am 7474bc3d
: Move the installed app details overflow button to the top.
...
* commit '39dfa34e5da9f8d6bfb83e05c4a4bc68e990027b':
Move the installed app details overflow button to the top.
2012-10-01 14:59:38 -07:00
Adam Powell
39dfa34e5d
am d7be24f6
: am 7474bc3d
: Move the installed app details overflow button to the top.
...
* commit 'd7be24f68a8104703775a196f0f2dd7fec5ba405':
Move the installed app details overflow button to the top.
2012-10-01 14:57:23 -07:00
Adam Powell
d7be24f68a
am 7474bc3d
: Move the installed app details overflow button to the top.
...
* commit '7474bc3dc2461d33dcdcaf5595635ac33e6e3979':
Move the installed app details overflow button to the top.
2012-10-01 14:55:00 -07:00
Adam Powell
7474bc3dc2
Move the installed app details overflow button to the top.
...
It looks ridiculous down by itself on a split action bar.
Bug 7258991
Change-Id: I4c373e1e154a793384a14e9622707ad464c1b1ca
2012-10-01 14:49:48 -07:00
Jeff Sharkey
a2c12a61de
Migrate telephony settings to Global.
...
Bug: 7231764
Change-Id: Ic28dacda8372b7976b5aa36be82e98e5ad069f9a
2012-10-01 14:03:45 -07:00
Baligh Uddin
b2262184ef
am 26576339
: (-s ours) am 5dde6f06
: am fd94d51e
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '26576339aa6db460d8421ef2e2e750b2e6dc571b':
Import translations. DO NOT MERGE
2012-10-01 13:46:42 -07:00
Baligh Uddin
6cccb9f870
am dc58137b
: (-s ours) am 070760b0
: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'dc58137b3713ac70886a2cac63856e4a94476788':
Import translations. DO NOT MERGE
2012-10-01 13:46:41 -07:00
Daniel Sandler
f4d1c3eae2
Support new ACTION_QUICK_CLOCK.
...
See change Ic561dbeb.
Bug: 7264806
Change-Id: I8439f2c25614ef794e43f85196d3f95c188e8cce
2012-10-01 16:45:10 -04:00
rich cannings
dcf3d3ffd3
am 60109bfd
: am e88c4bab
: am 82988b48
: Merge "Add Help lin to Settings > Security" into jb-mr1-dev
...
* commit '60109bfd0d986b76d3eb01306e2d422ce44d1545':
Add Help lin to Settings > Security
2012-10-01 11:18:31 -07:00
Amith Yamasani
a8f6d8f643
am 8858d0f9
: am 1035e199
: am 2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
...
* commit '8858d0f9d45d129c53ad18a2d8a2097c6215d25a':
Make Settings shortcuts launch into the correct activity/fragment.
2012-10-01 11:18:30 -07:00
Dianne Hackborn
68136ce2fa
am 967efc4a
: am d26005ea
: am 1a47ecd9
: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '967efc4a958b8e9de07c7d9f960b8f6273803f5e':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-10-01 11:18:29 -07:00
rich cannings
2fd700aebb
am e88c4bab
: am 82988b48
: Merge "Add Help lin to Settings > Security" into jb-mr1-dev
...
* commit 'e88c4bab2ee4fcefe431414f7eb64ae2c56ef022':
Add Help lin to Settings > Security
2012-10-01 11:10:28 -07:00
Baligh Uddin
26576339aa
am 5dde6f06
: am fd94d51e
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5dde6f06b8297e98eaed55e523dfeca4f4d7e558':
Import translations. DO NOT MERGE
2012-10-01 10:24:24 -07:00