Jeff Sharkey
b0e25f71a8
Merge "Follow API changes in framework." into jb-mr1-dev
2012-10-02 19:02:46 -07:00
Jeff Sharkey
be32d4b408
Follow API changes in framework.
...
Change-Id: I6c1f5c9ec342f69ceae3dddaa0cfab4e0a742372
2012-10-02 18:57:55 -07:00
Amith Yamasani
d8d92aa401
am ef1048d5: am d8c2511c: am a8f3a204: Merge "Improved dialog management in Settings>Users" into jb-mr1-dev
...
* commit 'ef1048d588d4c05420063b6b01b8f2fd20a6a5c9':
Improved dialog management in Settings>Users
2012-10-02 17:33:46 -07:00
Amith Yamasani
a8f3a204d9
Merge "Improved dialog management in Settings>Users" into jb-mr1-dev
2012-10-02 17:29:28 -07:00
Russell Brenner
f737960591
am 5a0d9e26: am 8828a1b0: am d13e3396: Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev
...
* commit '5a0d9e265cf8410a5a8bcceeaab56dbaac76a6fb':
Pass flag to indicate multiple users on device
2012-10-02 17:24:13 -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
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
6258a0e22e
Merge "Migrate telephony settings to Global." into jb-mr1-dev
2012-10-02 13:58:00 -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
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
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
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
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
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
rich cannings
82988b4871
Merge "Add Help lin to Settings > Security" into jb-mr1-dev
2012-09-30 15:48:55 -07:00
rich cannings
93c0ee52cc
Add Help lin to Settings > Security
...
Bug: 7210077
Change-Id: I1010356e27d85006e7d7dc62d935b67f53ccde12
2012-09-30 15:02:09 -07:00
Amith Yamasani
2485d9fc51
Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
2012-09-30 14:41:12 -07:00
Amith Yamasani
a9c55d8dbd
Make Settings shortcuts launch into the correct activity/fragment.
...
Bug: 6959454
Change the task affinities so that the shortcuts are not tied to
Settings main task.
Change-Id: I7729d17d8144a4a57f0d135fe80bdbd7af8dad01
2012-09-30 13:46:51 -07:00
Dianne Hackborn
e60b705a72
Fix issue #7255954 : API Review: rename Dream to DreamService
...
Change-Id: Ic374130cb37cbbfad0421089aecf30de87c4d369
2012-09-28 18:02:15 -07:00
Svetoslav Ganov
8cc4aa513b
am 894680f6: am a59f1aac: Setting to enable the global gesture for turning on accessibility.
...
* commit '894680f67c6b6112ccb71e565fd068492369580d':
Setting to enable the global gesture for turning on accessibility.
2012-09-28 16:19:25 -07:00
Svetoslav Ganov
a59f1aacc0
Setting to enable the global gesture for turning on accessibility.
...
1. Adding a setting to enable the gesture to turn on accessibility.
This is a new screen with a toggle switch similarly as screen
magnification which will contain explanation of how to perform
the gesture.
bug:6171929
Change-Id: I84dfa46a9b7b789d99923684e08e52cf7d236eb2
2012-09-28 15:43:21 -07:00
Russell Brenner
65c4eff41e
am 1344930f: am 88c9f288: Show warnings when skipping Wi-Fi connection
...
* commit '1344930f61e94c411edb2e07b31958b1d5c012b6':
Show warnings when skipping Wi-Fi connection
2012-09-28 12:52:51 -07:00
Russell Brenner
88c9f2889f
Show warnings when skipping Wi-Fi connection
...
If user skips over Wi-Fi, warn about possible carrier data charges or
inability to receive updates, depending on whether or not phone
service is available.
Note to translators: Some strings are being moved here from setup
wizard. They're tagged with their msgid's so as not to trigger
retranslation.
Bug: 7211786
Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0
2012-09-28 10:51:31 -07:00
Amith Yamasani
27b9ec937a
am 550c8f2b: am 990c5f24: Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
...
* commit '550c8f2bfd9fae5e1c140a30bc92f7afd69122db':
Bring up new user setup dialog when tapping on new user
2012-09-28 00:38:31 -07:00
rich cannings
6fb31c87d2
am d4d78dc4: am 4f64951c: Merge "Developer setting to skip Package Verification" into jb-mr1-dev
...
* commit 'd4d78dc4e3e19fab49f954e393f12ad05def494c':
Developer setting to skip Package Verification
2012-09-28 00:38:07 -07:00
Jeff Sharkey
cd2c9950aa
am bc91baed: am cc24aa2b: Merge "Follow more Secure settings to Global." into jb-mr1-dev
...
* commit 'bc91baed620593df183f60ec835de6ca5d7f000a':
Follow more Secure settings to Global.
2012-09-28 00:36:36 -07:00
Wink Saville
98c7b4348f
am d1ebef09: am b0873900: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
...
* commit 'd1ebef0914830c3b2fc6479fc49b06c98811d4a5':
Fix an NPE in WifiSettings.
2012-09-28 00:36:14 -07:00
Amith Yamasani
7656d941da
am c295f9d3: am 48af3cdb: Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
...
* commit 'c295f9d38e9575259120cd33866b87cd79f65826':
Rename "Owner info" to "User info" for secondary users
2012-09-28 00:35:15 -07:00
Russell Brenner
314ce581f7
am 6cd719c9: am 2c84b9f2: Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
...
* commit '6cd719c9e84c2b6f726c6def128eed5fb9871fe9':
Move super call to top of onActivityCreated
2012-09-28 00:34:25 -07:00
Adam Cohen
e36e87cd32
am 6956e4b0: am f4b6a682: Merge "Addressing issue 7243210, can\'t set status widget properly" into jb-mr1-dev
...
* commit '6956e4b007a202a2ca6e81c224aada069d38fe5c':
Addressing issue 7243210, can't set status widget properly
2012-09-28 00:34:01 -07:00
Robert Greenwalt
57e1f4b859
am b02bc8e6: am fffc9bef: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev
...
* commit 'b02bc8e6a007f42a0404d386477fc8f2852845eb':
Precreate a data structure so it's never null.
2012-09-28 00:33:59 -07:00
Amith Yamasani
990c5f2432
Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
2012-09-28 00:00:54 -07:00
rich cannings
4f64951cb8
Merge "Developer setting to skip Package Verification" into jb-mr1-dev
2012-09-27 23:11:50 -07:00
Amith Yamasani
1a634d32ac
Bring up new user setup dialog when tapping on new user
...
Bug: 7245796
Also fix a few strings that changed and other UI tweaks to conform
to spec document.
Change-Id: If4409459b20ec8c8ece69b6c23c8ab49b0ca0cac
2012-09-27 23:01:35 -07:00
Jeff Sharkey
cc24aa2b1f
Merge "Follow more Secure settings to Global." into jb-mr1-dev
2012-09-27 19:31:10 -07:00
Wink Saville
b08739003a
Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
2012-09-27 18:14:45 -07:00
rich cannings
f04211443e
Developer setting to skip Package Verification
...
Add a developer setting to skip package verification when installing over
USB/ADB/ADT, but still perform package verification on all other installs.
This change also fixes visibility issues. Namely, now all "Verify apps"
related settings will disappear when
Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE is 0.
Bug: 7183252
Change-Id: I04cfc4f521d1ecb73df56b172cf29cbd84f53dad
2012-09-27 17:15:46 -07:00
Jeff Sharkey
5246e7f76d
Follow more Secure settings to Global.
...
Bug: 7232014, 7231331, 7231198
Change-Id: Iea055cfa58edb253b55fe30bf294994ad338cfa4
2012-09-27 16:22:55 -07:00
Wink Saville
001e14a118
Fix an NPE in WifiSettings.
...
Under stressful conditions, like the Monkey tests, getActivity() can
return null. We assume this occurs when the fragment has shut down but
asynchronous commands are returning results. This change adds appropriate
null checks but assumes during normal operation the checks are not needed.
Bug: 7152711
Change-Id: I7a3736ccead33738dab1a36e78ae1d8042db6e94
2012-09-27 16:16:15 -07:00
Amith Yamasani
48af3cdbd9
Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
2012-09-27 16:06:49 -07:00
Russell Brenner
2c84b9f23c
Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
2012-09-27 15:14:27 -07:00
Amith Yamasani
8666b9e170
Rename "Owner info" to "User info" for secondary users
...
Bug: 7237781
Change-Id: I40207d6aa34bf3b7403f077fc7f3a945d739269d
2012-09-27 14:50:13 -07:00
Adam Cohen
f4b6a68215
Merge "Addressing issue 7243210, can't set status widget properly" into jb-mr1-dev
2012-09-27 13:14:17 -07:00
Robert Greenwalt
fffc9bef49
Merge "Precreate a data structure so it's never null." into jb-mr1-dev
2012-09-27 13:10:45 -07:00
Adam Cohen
eeb464ae43
Addressing issue 7243210, can't set status widget properly
...
Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
2012-09-27 13:04:00 -07:00