PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,373 Commits 1 Branch 0 Tags
edb906af3634a745fa154337fe0f923fc589ea3c
Commit Graph

10373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
5d46a54c55 am 8c94273c: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev 
* commit '8c94273c73480c35ee0af8910b32f0d4dec48132':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
 2013-04-10 14:16:34 -07:00
Dianne Hackborn
8c94273c73 Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev 2013-04-10 21:14:22 +00:00
Baligh Uddin
2256dc2dfa am 8059d27e: am fdc5489b: Import translations. DO NOT MERGE 
* commit '8059d27e73e89fd207ddbd3688c28b0dade11d78':
  Import translations. DO NOT MERGE
 2013-04-10 13:03:31 -07:00
Baligh Uddin
8059d27e73 am fdc5489b: Import translations. DO NOT MERGE 
* commit 'fdc5489b56a0432b1b05fd2cc36d8b729d9fabf5':
  Import translations. DO NOT MERGE
 2013-04-10 13:00:33 -07:00
Baligh Uddin
6bb143a9be Merge "Import translations. DO NOT MERGE" 2013-04-10 19:56:33 +00:00
Dianne Hackborn
1d675e6546 Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats 
Should be comparing with Bluetooth UID, not the wrong and broken GID.

Change-Id: I2cb33e25b0ae5a441a467c12d91860dcf36232dc
 2013-04-10 12:50:32 -07:00
Baligh Uddin
8c37212d09 Import translations. DO NOT MERGE 
Change-Id: Id2b91f9699560cd2f7a4858c9b96c8782a6a0601
Auto-generated-cl: translation import
 2013-04-10 11:30:34 -07:00
Baligh Uddin
fdc5489b56 Import translations. DO NOT MERGE 
Change-Id: Ifb727fcd1cfd28e78a2f405ee5cbba21e1999ab3
Auto-generated-cl: translation import
 2013-04-10 11:27:46 -07:00
The Android Open Source Project
b544e4f76d am 122bfe4f: Reconcile with jb-mr2-release - do not merge 
* commit '122bfe4f0495c22f1c18e4d79d7d20c2f3795114':
  Potential fix for a monkey-related NPE
 2013-04-10 10:08:20 -07:00
The Android Open Source Project
122bfe4f04 Reconcile with jb-mr2-release - do not merge 
Change-Id: I5597c4b46c146b190370d63e0128d2d84f80888a
 2013-04-10 10:06:01 -07:00
The Android Automerger
071d2cf06f merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-10 05:56:49 -07:00
Amith Yamasani
e2367654b6 am 0c8f9246: am 80b1dfe4: Merge "Select text in user name dialog" into jb-mr2-dev 
* commit '0c8f9246437234a0de217feb339c5811012bea5c':
  Select text in user name dialog
 2013-04-09 17:33:13 -07:00
Amith Yamasani
0c8f924643 am 80b1dfe4: Merge "Select text in user name dialog" into jb-mr2-dev 
* commit '80b1dfe46a85e3ecdbeca5575c205086e5ab07e0':
  Select text in user name dialog
 2013-04-09 17:30:51 -07:00
Amith Yamasani
80b1dfe46a Merge "Select text in user name dialog" into jb-mr2-dev 2013-04-10 00:29:12 +00:00
Amith Yamasani
583757908b Select text in user name dialog 
Enables quickly changing the name without moving the cursor.
Also use cap words style.

Bug: 8518507
Change-Id: I6841cad221b56bb4c3d51c21d30b3858d1ee3e1c
 2013-04-09 17:26:43 -07:00
Amith Yamasani
3727018a5a Potential fix for a monkey-related NPE 
Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.

Bug: 8005271

Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608
 2013-04-09 16:05:16 -07:00
Wink Saville
69e57fa7f3 am 9f5f4fdd: am 460f2478: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev 
* commit '9f5f4fdde61fabb634885e71f845d8d3c1fc9c7b':
  Add FW support for CellInfo RIL commands.
 2013-04-09 16:02:04 -07:00
Wink Saville
9f5f4fdde6 am 460f2478: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev 
* commit '460f24786a84106ec38e9209b2a943747deaf12c':
  Add FW support for CellInfo RIL commands.
 2013-04-09 15:57:23 -07:00
Wink Saville
460f24786a Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev 2013-04-09 22:50:41 +00:00
Baligh Uddin
2fc80bd076 am 4e30157f: am f0e09bf7: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '4e30157fb22bcdc16ea61f3b137ced17dd35b333':
  Import translations. DO NOT MERGE
 2013-04-09 14:25:26 -07:00
Ben Murdoch
9f8c61ee1a am 6fdc642e: am f452008f: Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev 
* commit '6fdc642e8640927bee97f93812a58897afa252e9':
  Properly remove experimental WebView preference when unavailable.
 2013-04-09 14:25:22 -07:00
Amith Yamasani
dfead4eb31 am e9691ed5: am 0a970cae: Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev 
* commit 'e9691ed5fb51b58dc4b144fec4226e6353f8df93':
  Send app restrictions broadcast to stopped apps as well
 2013-04-09 14:25:16 -07:00
Baligh Uddin
4e30157fb2 am f0e09bf7: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'f0e09bf702cb62abe6bd53d17e5dd2e9593cc3b0':
  Import translations. DO NOT MERGE
 2013-04-09 12:29:52 -07:00
Baligh Uddin
87f4c1d5be Merge "Import translations. DO NOT MERGE" 2013-04-09 19:26:26 +00:00
Baligh Uddin
f0e09bf702 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-09 19:26:15 +00:00
Ben Murdoch
6fdc642e86 am f452008f: Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev 
* commit 'f452008f5b6bf57dca0b624c14a7f3cfa1ae8fdd':
  Properly remove experimental WebView preference when unavailable.
 2013-04-09 12:03:53 -07:00
Ben Murdoch
f452008f5b Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev 2013-04-09 19:00:41 +00:00
Jared Duke
9225bc538d Properly remove experimental WebView preference when unavailable. 
When the experimental WebView library is unavailable, properly remove it from
the appropriate preferences group.

Bug: 8572673
Change-Id: I34dd0720199c826ca12e0f991e2f6bd9c5ad35f3
 2013-04-09 19:14:57 +01:00
Amith Yamasani
e9691ed5fb am 0a970cae: Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev 
* commit '0a970caed489fc10078eaad6796ee06832323bde':
  Send app restrictions broadcast to stopped apps as well
 2013-04-09 11:12:42 -07:00
Amith Yamasani
0a970caed4 Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev 2013-04-09 18:09:40 +00:00
Amith Yamasani
872d4fba77 Send app restrictions broadcast to stopped apps as well 
Otherwise the restrictions won't be shown for apps that haven't been
launched yet.

Bug: 8577600
Change-Id: I1d0d93553456dfedfb749e3d8262911af4362a80
 2013-04-09 11:05:18 -07:00
Amith Yamasani
66ab414ea8 am 631285a4: am 350938ec: Potential fix for a monkey-related NPE 
* commit '631285a43f0c1de9df02d3ebd1c4e22a6ef74d1f':
  Potential fix for a monkey-related NPE
 2013-04-09 10:39:32 -07:00
Amith Yamasani
631285a43f am 350938ec: Potential fix for a monkey-related NPE 
* commit '350938ecc69085badef2edc16491ff7a461dfb08':
  Potential fix for a monkey-related NPE
 2013-04-09 10:35:12 -07:00
Amith Yamasani
350938ecc6 Potential fix for a monkey-related NPE 
Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.

Bug: 8005271

Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608
 2013-04-09 10:25:43 -07:00
The Android Automerger
0e130741ea merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-09 05:56:08 -07:00
Wink Saville
bf4712895a Add FW support for CellInfo RIL commands. 
Add being able to setCellInfoListRate.

Bug: 8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
 2013-04-08 15:19:44 -07:00
The Android Open Source Project
bca88363b2 am 54f1b924: Reconcile with jb-mr2-release - do not merge 
* commit '54f1b924667589c519e395e3bd2e58e9c000376a':
  Notification listeners can be enabled in Settings>Security.
  Reference new StatusBarNotification and INotificationListener packages.
 2013-04-08 13:40:34 -07:00
The Android Open Source Project
54f1b92466 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6f525da73cd808b3dd861d2df8b279c861041b02
 2013-04-08 13:36:32 -07:00
Maggie Benthall
11b69bf86d Implement Settings app UX for when a user has bluetooth config locked down. 
When a user has the user restriction DISALLOW_CONFIG_BLUETOOTH
- Remove all the menu items for searching and other config
- Hide "available" but non-paired devices
- Remove settings button from paired devices
- Remove ability to make the device visible to others

Change-Id: Icaebf29d3cce55d924fdd65449447b5b7a438bbe
 2013-04-08 16:05:38 -04:00
Baligh Uddin
a738ede79a Import translations. DO NOT MERGE 
Change-Id: Ia600f0bea337c6a06f9fa46c62ca4ff2b164c6e6
Auto-generated-cl: translation import
 2013-04-08 12:50:23 -07:00
Baligh Uddin
1d4bbaef8c Import translations. DO NOT MERGE 
Change-Id: Ib3ac2b538aa44464e84db39d318f828b656eb759
Auto-generated-cl: translation import
 2013-04-08 12:47:32 -07:00
Kenny Root
26b016320d am d1e485a8: resolved conflicts for merge of 3a271718 to jb-mr2-dev-plus-aosp 
* commit 'd1e485a8fc84e4aa279fcaf482fa2247b365574a':
  Allow multiuser use of keystore
 2013-04-08 12:10:16 -07:00
Kenny Root
d1e485a8fc resolved conflicts for merge of 3a271718 to jb-mr2-dev-plus-aosp 
Change-Id: If405c0e3ccff4029c2b54cf557d09c086485ab20
 2013-04-08 12:06:29 -07:00
Kenny Root
fc783b06cd am 56e75f3c: am 645e78d8: Merge "Allow multiuser use of keystore" into jb-mr2-dev 
* commit '56e75f3c170f859ecd05b43ca5e3a14ac7878cf7':
  Allow multiuser use of keystore
 2013-04-08 11:07:37 -07:00
Kenny Root
56e75f3c17 am 645e78d8: Merge "Allow multiuser use of keystore" into jb-mr2-dev 
* commit '645e78d8063169fa59b69bdc83ac5a62840d3253':
  Allow multiuser use of keystore
 2013-04-08 11:04:10 -07:00
Kenny Root
645e78d806 Merge "Allow multiuser use of keystore" into jb-mr2-dev 2013-04-08 17:58:37 +00:00
Kenny Root
c5550c2012 Allow multiuser use of keystore 
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

(cherry picked from commit cc48b0104e)

Bug: 7249554
Change-Id: I419474151380c29e49e50451befbbdf3af65b175
 2013-04-08 10:36:05 -07:00
Kenny Root
3a27171881 Merge "Allow multiuser use of keystore" 2013-04-08 17:34:32 +00:00
Kenny Root
cc48b0104e Allow multiuser use of keystore 
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

Bug: 7249554
Change-Id: I5aa069ca439cea68e87e141c497be8cd86b0ba9d
 2013-04-08 10:23:38 -07:00
Daniel Sandler
2fb4c37260 am afa0b2c5: am b8c4898c: Fix "no notification listeners" text. 
* commit 'afa0b2c5a884107d135c868bb6a0659990051005':
  Fix "no notification listeners" text.
 2013-04-08 09:15:46 -07:00