Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,698 Commits 1 Branch 0 Tags
57c4ddcb15b157a0f29e92624b7bfd1348a5e81c
Commit Graph

7613 Commits

Author SHA1 Message Date
Sanket Padawe
aa10a9ec83 am 5ba90c14: Increase char limit of the data usage Settings string to 33. 
* commit '5ba90c148d41ae3f330d7f31de8bced5e21c8727':
  Increase char limit of the data usage Settings string to 33.
 2015-06-19 01:51:27 +00:00
Sanket Padawe
5ba90c148d Increase char limit of the data usage Settings string to 33. 
Bug: 21801556
Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
 2015-06-18 18:39:25 -07:00
Jason Monk
8af26277a3 am 8a753643: am 5fd5890f: am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev 
* commit '8a753643058760fb44a286dbf7d198053a3f3a01':
  Fix ListView being too eager too scroll
 2015-06-18 20:43:09 +00:00
Jason Monk
8a75364305 am 5fd5890f: am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev 
* commit '5fd5890f5b94d102d7cf655fd0d1dbd9d09dd55f':
  Fix ListView being too eager too scroll
 2015-06-18 20:30:36 +00:00
Jason Monk
5fd5890f5b am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev 
* commit '47a26c79288723b8604a91c5cd8daedd83f183f2':
  Fix ListView being too eager too scroll
 2015-06-18 20:16:51 +00:00
Jason Monk
47a26c7928 Merge "Fix ListView being too eager too scroll" into mnc-dev 2015-06-18 20:07:40 +00:00
Jason Monk
66aa964e2a Fix ListView being too eager too scroll 
ListView is always too eager to scroll, so just stop using it.

Bug: 21853796
Change-Id: Id37d89b0312597a9fb65a33f151af34b3f395d91
 2015-06-18 15:56:21 -04:00
Alex Chau
3fb2e54ace am ee6ffccb: am 1e24271a: am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev 
* commit 'ee6ffccbc7ff4015597da1fcc725456117a3141c':
  Enforce Keyguard policy in Notification Settings
 2015-06-18 17:47:27 +00:00
Alex Chau
ee6ffccbc7 am 1e24271a: am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev 
* commit '1e24271a9bee773911b630637c7096613d825a27':
  Enforce Keyguard policy in Notification Settings
 2015-06-18 17:35:55 +00:00
Alex Chau
1e24271a9b am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev 
* commit 'cd0da9c14ef11bdaca1a470fb1d87042d51f9ae7':
  Enforce Keyguard policy in Notification Settings
 2015-06-18 17:22:23 +00:00
Brian Carlstrom
972ed7750f Clarify process_dex2oat_label description 
Bug: 21898104
Change-Id: I264f784db761ac51a1dde51f189fb017b7d378b1
 2015-06-18 10:11:18 -07:00
Alex Chau
cd0da9c14e Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev 2015-06-18 17:10:35 +00:00
Jason Monk
1b23ef2e59 am beab783c: am 6afa2a51: am ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev 
* commit 'beab783cfddd8b31e3406cfbaa9b180d553f4a33':
  Revert "Accounts -> Account sync"
 2015-06-18 16:32:55 +00:00
Jason Monk
beab783cfd am 6afa2a51: am ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev 
* commit '6afa2a51245cf026ba1606098d65db6d958da1c6':
  Revert "Accounts -> Account sync"
 2015-06-18 16:20:26 +00:00
Jason Monk
163fbd25be am e707ea37: am a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev 
* commit 'e707ea3720188599385be2abaa9efbdf14f0560c':
  Remove battery history graph from details screen
 2015-06-18 16:12:00 +00:00
Jason Monk
f69f6bcb80 am f99a90d1: am eddd983d: am 58f6728e: Allow give/take in app version/disabled fields 
* commit 'f99a90d13979525882ec4e6599b423c73fab5643':
  Allow give/take in app version/disabled fields
 2015-06-18 16:11:59 +00:00
Jason Monk
6afa2a5124 am ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev 
* commit 'ed672cfc8c3acb8b5d3fe932e1b31e20b32594c8':
  Revert "Accounts -> Account sync"
 2015-06-18 16:11:49 +00:00
Jason Monk
ed672cfc8c Merge "Revert "Accounts -> Account sync"" into mnc-dev 2015-06-18 15:54:56 +00:00
Jason Monk
e707ea3720 am a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev 
* commit 'a0336eb47f6256af21fb4b8e3597e04281839d1d':
  Remove battery history graph from details screen
 2015-06-18 15:49:19 +00:00
Jason Monk
f99a90d139 am eddd983d: am 58f6728e: Allow give/take in app version/disabled fields 
* commit 'eddd983de58b0fc5499e06591fa3750ff3d7292b':
  Allow give/take in app version/disabled fields
 2015-06-18 15:49:16 +00:00
Jason Monk
06fc34e25a Revert "Accounts -> Account sync" 
This reverts commit 43db745ea0.

Bug: 21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
 2015-06-18 15:44:46 +00:00
Jason Monk
a0336eb47f am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev 
* commit '1a129e0fbb2fdfc4f5b7bda82a457e907a4aeb4f':
  Remove battery history graph from details screen
 2015-06-18 15:41:36 +00:00
Jason Monk
eddd983de5 am 58f6728e: Allow give/take in app version/disabled fields 
* commit '58f6728e6ef8c89d9b88d78b19b2d0f24135564d':
  Allow give/take in app version/disabled fields
 2015-06-18 15:41:35 +00:00
Jason Monk
1a129e0fbb Merge "Remove battery history graph from details screen" into mnc-dev 2015-06-18 15:31:23 +00:00
Jason Monk
04ac693da7 Remove battery history graph from details screen 
Bug: 21854416
Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
 2015-06-18 11:07:31 -04:00
Alex Chau
ccade40278 Enforce Keyguard policy in Notification Settings 
- Applied getKeyguardDisabledFeatures for notification settings and
    notification setup page (after settings a screenlock)
- If a notification settings is disabled, the next least secure setting
    will be chosen
- Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be
    profile, it will not be reflected in both settings page. This is
    because it does not affect the owner (user 0), as mentioned in
    DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER
- Skip RedactionInterstitial if there is <= 1 options for the user
- Tested with both Setup wizard and settings case, both pattern and
    password, as well as toggling the policy on and off

Bug: 19307118
Bug: 17099898

Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a
 2015-06-18 16:00:16 +01:00
Jason Monk
53a5d7ff2c Update disable dialog 
Bug: 20826933
Change-Id: Ib84d3ba50ead2b71f62a3b163a5f5ba32a576c00
 2015-06-18 10:46:55 -04:00
Jason Monk
58f6728e6e Allow give/take in app version/disabled fields 
Switch to wrap_content so if one view is smaller, the other
can use its space.

Bug: 21901206
Change-Id: Ic69d2577c3291e6ed171caa0fa361ccc43eaf180
 2015-06-18 10:36:39 -04:00
Geoff Mendal
2eb7ad2648 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-17 15:23:34 +00:00
Geoff Mendal
38f0b79f33 Import translations. DO NOT MERGE 
Change-Id: I1ec85dbe877d7fae6edf1f93ec812bc7b1223daa
Auto-generated-cl: translation import
 2015-06-17 07:59:14 -07:00
Geoff Mendal
a2bb6038c2 Import translations. DO NOT MERGE 
Change-Id: I74442ac6e0aab88878469be16d6518bd1af75861
Auto-generated-cl: translation import
 2015-06-17 07:27:41 -07:00
Jason Monk
f424ccf743 am 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE 
* commit '5c2de952e5e7f2501df7a5a94794e526902e47a3':
  RIP -night DO NOT MERGE
 2015-06-17 13:47:00 +00:00
Jason Monk
5c2de952e5 am 7fdb1478: RIP -night DO NOT MERGE 
* commit '7fdb1478728ed7eaab956da476540b3e9c97b9b3':
  RIP -night DO NOT MERGE
 2015-06-17 13:37:31 +00:00
Jason Monk
7fdb147872 RIP -night DO NOT MERGE 
Bug: 21854466
Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533
 2015-06-17 09:17:31 -04:00
Jeff Sharkey
c162b354c2 am a39077c9: am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev 
* commit 'a39077c95bb51102e77e55a2d4e352f8027d5c24':
  Actually gracefully finish this time around.
 2015-06-17 03:54:31 +00:00
Jeff Sharkey
a39077c95b am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev 
* commit '67832cc3984665cf55ac3d4afc5fdbb76326f1a0':
  Actually gracefully finish this time around.
 2015-06-17 03:45:06 +00:00
Jeff Sharkey
67832cc398 am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev 
* commit '74c7f1fcd3451bdb5b49f2b44b86fd4ec8eb6794':
  Actually gracefully finish this time around.
 2015-06-17 03:31:44 +00:00
Jeff Sharkey
74c7f1fcd3 Merge "Actually gracefully finish this time around." into mnc-dev 2015-06-17 03:23:59 +00:00
Jeff Sharkey
665094c9d2 Actually gracefully finish this time around. 
Also fix tinting on front-door icon.

Bug: 21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
 2015-06-16 20:21:12 -07:00
Jim Miller
de1d7db439 am 8b5943c2: am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev 
* commit '8b5943c2fb4d069797df0c1a4b43f2d604eb6385':
  Fix issue with german translation of lock times
 2015-06-17 00:33:52 +00:00
Jim Miller
8b5943c2fb am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev 
* commit 'dd0d9854a5e4e946e8cb55a91148f17e4424836f':
  Fix issue with german translation of lock times
 2015-06-17 00:20:35 +00:00
Jim Miller
dd0d9854a5 am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev 
* commit '4b60af78fa8b0c474c9aee0f03171867843d2838':
  Fix issue with german translation of lock times
 2015-06-17 00:09:52 +00:00
Jim Miller
4b60af78fa Merge "Fix issue with german translation of lock times" into mnc-dev 2015-06-16 23:59:43 +00:00
Brian Carlstrom
8453e36188 am 99c1009a: am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 
* commit '99c1009a897834e8282a59c0dda8f29dd33234e4':
  dex2oat should show something friendlier in Settings -> Battery
 2015-06-16 23:25:53 +00:00
Jim Miller
50d7d19a73 Fix issue with german translation of lock times 
The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.

Fixes bug 21602326

Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
 2015-06-16 16:21:27 -07:00
Brian Carlstrom
99c1009a89 am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 
* commit '49d73c03aa5b8b21c5e8a926b6a894245ffdf906':
  dex2oat should show something friendlier in Settings -> Battery
 2015-06-16 23:18:33 +00:00
Brian Carlstrom
49d73c03aa am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 
* commit '94f4cb4e4660db823d268d14eb1199dbc11f8e86':
  dex2oat should show something friendlier in Settings -> Battery
 2015-06-16 23:07:52 +00:00
Jeff Sharkey
1a1a109936 am aa1e5f2f: am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev 
* commit 'aa1e5f2f001aa7cc39ce4b0c5974bfc47a8d96fa':
  Finish storage wizard theming.
 2015-06-16 23:00:45 +00:00
Brian Carlstrom
94f4cb4e46 Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 2015-06-16 22:59:04 +00:00
Jeff Sharkey
aa1e5f2f00 am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev 
* commit '5fafa130ec8f031310e5372a89034057053fa634':
  Finish storage wizard theming.
 2015-06-16 22:49:20 +00:00