PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,713 Commits 1 Branch 0 Tags
a70688feac09e4b4d832001bc1adb23e2e11cccc
Commit Graph

9713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
dc58137b37 am 070760b0: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '070760b06592de6e5b39cce9e1bfb34ee20c4d23':
  Import translations. DO NOT MERGE
 2012-10-01 10:24:21 -07:00
Baligh Uddin
5dde6f06b8 am fd94d51e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'fd94d51e945273a942947433aed828884bbaa17f':
  Import translations. DO NOT MERGE
 2012-10-01 10:17:37 -07:00
Baligh Uddin
4f5fc18008 Merge "Import translations. DO NOT MERGE" 2012-10-01 10:16:56 -07:00
rich cannings
60109bfd0d 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 10:16:18 -07:00
Amith Yamasani
8858d0f9d4 am 1035e199: am 2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev 
* commit '1035e19941e7b51ea5044e34b4b03abd1017f50e':
  Make Settings shortcuts launch into the correct activity/fragment.
 2012-10-01 10:16:07 -07:00
Baligh Uddin
fd94d51e94 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-01 10:15:56 -07:00
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
2ae9f687ca am 7a50c4d4: Merge from jb-mr1-aah-dev 
* commit '7a50c4d4c4b59ed9da2a82bab42a403674da0379':
 2012-09-28 17:17:43 -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
6ed143f897 am d28ed8d6: am a59cc272: Merge "Colorize premium sms ui." into jb-mr1-dev 
* commit 'd28ed8d66af6b03628c7dd1904778a5160b8d619':
  Colorize premium sms ui.
 2012-09-28 17:06:34 -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
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
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
ce14cbd72d am 4c718398: Merge remote-tracking branch \'goog/jb-mr1-aah-dev\' into HEAD 
* commit '4c7183987b1c010abaf9d140ea33da7ba921c031':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fix build. Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
 2012-09-28 13:52:40 -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
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
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
98bf18189a Import translations. DO NOT MERGE 
Change-Id: I2c9eef6afc2f8ea2896d4c17ae13479ee15c6c60
Auto-generated-cl: translation import
 2012-09-28 12:43:41 -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
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
Baligh Uddin
a51e1b9978 am b15c5ee2: (-s ours) am ec4a1520: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b15c5ee284d9a81c75fb8f741986834797a334ec':
  Import translations. DO NOT MERGE
 2012-09-28 00:38:25 -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
Baligh Uddin
14e942fc8c am 6238559e: (-s ours) am bfb5fa9e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6238559ebb0f922aa461739e1ae8a6f5fd57e9cc':
  Import translations. DO NOT MERGE
 2012-09-28 00:33:03 -07:00