Baligh Uddin
070760b065
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-01 10:15:18 -07:00
Dianne Hackborn
967efc4a95
am d26005ea
: am 1a47ecd9
: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit 'd26005ea8569da03bbb30601e28ba3c139ae6b06':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-10-01 10:13:29 -07:00
The Android Automerger
0205b4c1fb
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 18:17:55 -07:00
rich cannings
e88c4bab2e
am 82988b48
: Merge "Add Help lin to Settings > Security" into jb-mr1-dev
...
* commit '82988b4871bd318d16aeb13947c7388eb1c5f195':
Add Help lin to Settings > Security
2012-09-30 15:51:24 -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
1035e19941
am 2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
...
* commit '2485d9fc5113e7a886ae5b59e535905b0f210fa4':
Make Settings shortcuts launch into the correct activity/fragment.
2012-09-30 14:42:53 -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
The Android Automerger
392122e0cf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 07:00:11 -07:00
Dianne Hackborn
d26005ea85
am 1a47ecd9
: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '1a47ecd9269ff28bec71592b8c3d9a857ac49967':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-09-28 18:22:27 -07:00
Dianne Hackborn
1a47ecd926
Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
2012-09-28 18:18:22 -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
Jean-Baptiste Queru
7a50c4d4c4
Merge from jb-mr1-aah-dev
...
Change-Id: I32058e2adca0ba7caf9a6f562c690ca5b68ddeb1
2012-09-28 17:15:38 -07:00
Robert Greenwalt
d760bbb8b6
am a59cc272
: Merge "Colorize premium sms ui." into jb-mr1-dev
...
* commit 'a59cc2722e6dd3cdc50e27c9564d4da37c952cf6':
Colorize premium sms ui.
2012-09-28 17:09:56 -07:00
Svetoslav Ganov
6f0b3e29bc
am a59f1aac
: Setting to enable the global gesture for turning on accessibility.
...
* commit 'a59f1aacc0b55a301ce8b36498f79c9f589c5f20':
Setting to enable the global gesture for turning on accessibility.
2012-09-28 17:06:43 -07:00
Robert Greenwalt
d28ed8d66a
am a59cc272
: Merge "Colorize premium sms ui." into jb-mr1-dev
...
* commit 'a59cc2722e6dd3cdc50e27c9564d4da37c952cf6':
Colorize premium sms ui.
2012-09-28 16:55:32 -07:00
Robert Greenwalt
a59cc2722e
Merge "Colorize premium sms ui." into jb-mr1-dev
2012-09-28 16:54:04 -07:00
Svetoslav Ganov
894680f67c
am a59f1aac
: Setting to enable the global gesture for turning on accessibility.
...
* commit 'a59f1aacc0b55a301ce8b36498f79c9f589c5f20':
Setting to enable the global gesture for turning on accessibility.
2012-09-28 15:51:50 -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
2a840aef3a
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 14:23:23 -07:00
Jean-Baptiste Queru
4c7183987b
Merge remote-tracking branch 'goog/jb-mr1-aah-dev' into HEAD
2012-09-28 13:49:56 -07:00
Russell Brenner
6dc415f418
am 88c9f288
: Show warnings when skipping Wi-Fi connection
...
* commit '88c9f2889fafb53a2875418317ecd197d9aae883':
Show warnings when skipping Wi-Fi connection
2012-09-28 12:52:14 -07:00
Russell Brenner
1344930f61
am 88c9f288
: Show warnings when skipping Wi-Fi connection
...
* commit '88c9f2889fafb53a2875418317ecd197d9aae883':
Show warnings when skipping Wi-Fi connection
2012-09-28 12:50:55 -07:00
Baligh Uddin
b3696f89bb
Import translations. DO NOT MERGE
...
Change-Id: Ib65119cb5455e20a3a10ff0a45f54aa0d819d8ec
Auto-generated-cl: translation import
2012-09-28 12:40:54 -07:00
Baligh Uddin
448abd4aef
Import translations. DO NOT MERGE
...
Change-Id: I9801833688c9dfc5e8ac238da034d17974ad6823
Auto-generated-cl: translation import
2012-09-28 12:38:50 -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
The Android Automerger
a70c5e1b6a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-28 06:59:56 -07:00
Amith Yamasani
e6f4a99ae7
am 990c5f24
: Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
...
* commit '990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c':
Bring up new user setup dialog when tapping on new user
2012-09-28 00:03:09 -07:00
Amith Yamasani
550c8f2bfd
am 990c5f24
: Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
...
* commit '990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c':
Bring up new user setup dialog when tapping on new user
2012-09-28 00:02:54 -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
Baligh Uddin
5ce059f9a0
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-27 23:49:03 -07:00
Baligh Uddin
b15c5ee284
am ec4a1520
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'ec4a152071fb9e3dcdf00eec2444afc6df800540':
Import translations. DO NOT MERGE
2012-09-27 23:44:46 -07:00
Baligh Uddin
c5776665dd
am ec4a1520
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'ec4a152071fb9e3dcdf00eec2444afc6df800540':
Import translations. DO NOT MERGE
2012-09-27 23:44:42 -07:00
Baligh Uddin
ec4a152071
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-27 23:41:51 -07:00
Baligh Uddin
284dce73ae
Import translations. DO NOT MERGE
...
Change-Id: Ifc3aa0738b4f2beccdc05c1c225ff60308def5d4
Auto-generated-cl: translation import
2012-09-27 23:40:16 -07:00
Baligh Uddin
7ba9c3b5b1
Import translations. DO NOT MERGE
...
Change-Id: I38fbd0c22b6056e9c089425511481e6c4b1dacac
Auto-generated-cl: translation import
2012-09-27 23:38:37 -07:00
rich cannings
c155e051eb
am 4f64951c
: Merge "Developer setting to skip Package Verification" into jb-mr1-dev
...
* commit '4f64951cb89c5da82fdbba3c02bccf0f3500c2a7':
Developer setting to skip Package Verification
2012-09-27 23:13:57 -07:00
rich cannings
d4d78dc4e3
am 4f64951c
: Merge "Developer setting to skip Package Verification" into jb-mr1-dev
...
* commit '4f64951cb89c5da82fdbba3c02bccf0f3500c2a7':
Developer setting to skip Package Verification
2012-09-27 23:13:19 -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
bc91baed62
am cc24aa2b
: Merge "Follow more Secure settings to Global." into jb-mr1-dev
...
* commit 'cc24aa2b1f58236867a4e0c326e5ce4197df55d8':
Follow more Secure settings to Global.
2012-09-27 19:33:35 -07:00
Jeff Sharkey
ed1b291c47
am cc24aa2b
: Merge "Follow more Secure settings to Global." into jb-mr1-dev
...
* commit 'cc24aa2b1f58236867a4e0c326e5ce4197df55d8':
Follow more Secure settings to Global.
2012-09-27 19:32:54 -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
ebc3ef24be
am b0873900
: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
...
* commit 'b08739003aa2cbc4dfe650f6badda8cfe2be1e76':
Fix an NPE in WifiSettings.
2012-09-27 18:16:22 -07:00
Wink Saville
d1ebef0914
am b0873900
: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
...
* commit 'b08739003aa2cbc4dfe650f6badda8cfe2be1e76':
Fix an NPE in WifiSettings.
2012-09-27 18:16:04 -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