PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,433 Commits 1 Branch 0 Tags
5a0d9e265cf8410a5a8bcceeaab56dbaac76a6fb
Commit Graph

8433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
81a3dfd4e3 Reconcile with jb-mr1-release - do not merge 
Change-Id: I31f2c7e4ec4673e7b360ba4abc94b4138cb135d8
 2012-10-02 09:20:26 -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
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
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
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
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
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
Daniel Sandler
f4d1c3eae2 Support new ACTION_QUICK_CLOCK. 
See change Ic561dbeb.

Bug: 7264806
Change-Id: I8439f2c25614ef794e43f85196d3f95c188e8cce
 2012-10-01 16:45:10 -04: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
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
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