PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,194 Commits 1 Branch 0 Tags
fdd5e73f7ba2b528f40a6f83009347e5c93eb4fb
Commit Graph

20194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
fdd5e73f7b am c1dc5acf: am f1536e4a: Merge "Hide permission related summaries" into mnc-dev 
* commit 'c1dc5acfb0ea098ba85af413b37b54df3472a831':
  Hide permission related summaries
 2015-05-13 19:48:04 +00:00
Jason Monk
c1dc5acfb0 am f1536e4a: Merge "Hide permission related summaries" into mnc-dev 
* commit 'f1536e4a1b02055efbe27d963aa7c1df64681783':
  Hide permission related summaries
 2015-05-13 19:37:07 +00:00
John Spurlock
91ab24ed3b am fad62c47: am 07851208: Merge "Settings: New string for zen messages summary." into mnc-dev 
* commit 'fad62c472678c180475fb73463103209a1b5bd83':
  Settings: New string for zen messages summary.
 2015-05-13 19:28:41 +00:00
Jason Monk
f1536e4a1b Merge "Hide permission related summaries" into mnc-dev 2015-05-13 19:22:47 +00:00
Jason Monk
63a819aa35 Hide permission related summaries 
We need to get this data from the PackageInstaller directly, in the
mean time hide the summaries since they are incorrect.

Bug: 21078474
Change-Id: I1c1b50ee6806cfbf16830fbff5bf8ffae344451a
 2015-05-13 15:19:57 -04:00
John Spurlock
fad62c4726 am 07851208: Merge "Settings: New string for zen messages summary." into mnc-dev 
* commit '07851208fc43afb343085bbfc9fbab6741d8bb03':
  Settings: New string for zen messages summary.
 2015-05-13 19:16:08 +00:00
Jason Monk
5fd31256a9 am 3a6561ca: am 78161c73: Merge "Add additional permissions button to manage perms" into mnc-dev 
* commit '3a6561ca4112b1f9da790064b784b8a00a6e9106':
  Add additional permissions button to manage perms
 2015-05-13 19:10:42 +00:00
John Spurlock
07851208fc Merge "Settings: New string for zen messages summary." into mnc-dev 2015-05-13 19:07:51 +00:00
John Spurlock
fcfcb5ddc4 Settings: New string for zen messages summary. 
Bug: 20064962
Change-Id: Ie39ee78b2ec351f6b41ad5584af44966efb2a3aa
 2015-05-13 15:02:58 -04:00
Jason Monk
3a6561ca41 am 78161c73: Merge "Add additional permissions button to manage perms" into mnc-dev 
* commit '78161c737557cdfea30e6ac3e06be75db72b1cd8':
  Add additional permissions button to manage perms
 2015-05-13 18:54:47 +00:00
Jason Monk
78161c7375 Merge "Add additional permissions button to manage perms" into mnc-dev 2015-05-13 18:40:51 +00:00
Jason Monk
c25f11889c Add additional permissions button to manage perms 
Bug: 20269176
Change-Id: Ic004204b0fd984717a6d3848e8295edc67047883
 2015-05-13 14:40:02 -04:00
Chris Wren
663f71b4c1 am 0e63a138: am 0c3d8f1c: Merge "replace temporary metrics categories with permanent ones." into mnc-dev 
* commit '0e63a138aa9e45cd6fdd4877676eda2973ea7bd0':
  replace temporary metrics categories with permanent ones.
 2015-05-13 18:24:01 +00:00
Chris Wren
0e63a138aa am 0c3d8f1c: Merge "replace temporary metrics categories with permanent ones." into mnc-dev 
* commit '0c3d8f1c0f869f5faa4b828e118f8717c8f77d40':
  replace temporary metrics categories with permanent ones.
 2015-05-13 18:15:33 +00:00
Chris Wren
0c3d8f1c0f Merge "replace temporary metrics categories with permanent ones." into mnc-dev 2015-05-13 18:06:00 +00:00
Xiyuan Xia
ae900bc65e am fe2cee7b: am e2862a00: Merge "Migrate settings UI to use async security check" into mnc-dev 
* commit 'fe2cee7b2d7d2ac75e7449892706a6f2e24ffb4a':
  Migrate settings UI to use async security check
 2015-05-13 17:46:11 +00:00
Jason Monk
921bda5c71 am 2863a945: am a8dae2af: Merge "Start app notifications as fragment not intent" into mnc-dev 
* commit '2863a9457a9ca10654bc0028b5eb03449041e509':
  Start app notifications as fragment not intent
 2015-05-13 17:46:10 +00:00
Chris Wren
8b7dc08e77 replace temporary metrics categories with permanent ones. 
Bug: 21114836
Change-Id: I05ca033e2e15fc1ae4330453bbe50aaa6cd1ea6c
 2015-05-13 13:44:36 -04:00
Xiyuan Xia
fe2cee7b2d am e2862a00: Merge "Migrate settings UI to use async security check" into mnc-dev 
* commit 'e2862a00b1ce2cf5ec9c3c8402a973c0fe426685':
  Migrate settings UI to use async security check
 2015-05-13 17:32:04 +00:00
Jason Monk
2863a9457a am a8dae2af: Merge "Start app notifications as fragment not intent" into mnc-dev 
* commit 'a8dae2af5082e1a9c361477cc03bf1da695851b8':
  Start app notifications as fragment not intent
 2015-05-13 17:32:04 +00:00
Xiyuan Xia
e2862a00b1 Merge "Migrate settings UI to use async security check" into mnc-dev 2015-05-13 17:21:00 +00:00
Jason Monk
a8dae2af50 Merge "Start app notifications as fragment not intent" into mnc-dev 2015-05-13 15:40:08 +00:00
Jason Monk
255452fdf4 Start app notifications as fragment not intent 
This lets it show the back arrow when coming from within the settings
app.

Bug: 20561808
Change-Id: I103c8fb74197c5a0530c363a234da5e2148726a7
 2015-05-13 11:36:45 -04:00
Xiyuan Xia
bf9ac6b4fb Migrate settings UI to use async security check 
Bug: 20697812
Change-Id: Ieb0090ddb61198a60abb1e34ff9c6e8476c33789
 2015-05-13 15:32:45 +00:00
Geoff Mendal
c160e9a224 am 453511fc: (-s ours) am ec36780b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '453511fc39779d86329cf7ade6d6906e709502db':
  Import translations. DO NOT MERGE
 2015-05-13 15:23:16 +00:00
Jason Monk
28ab340c9d am 417c9b46: am 02f0a4af: Fix connecting to secure wifi from QS 
* commit '417c9b462574f0c44c7bcf80beac457f21fbc72f':
  Fix connecting to secure wifi from QS
 2015-05-13 15:23:15 +00:00
Geoff Mendal
453511fc39 am ec36780b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ec36780b6aae94d5a23b2f635bd3ba811aef6ae0':
  Import translations. DO NOT MERGE
 2015-05-13 15:12:38 +00:00
Jason Monk
417c9b4625 am 02f0a4af: Fix connecting to secure wifi from QS 
* commit '02f0a4aff3349513e69ea6697151c60088f75dcd':
  Fix connecting to secure wifi from QS
 2015-05-13 15:12:35 +00:00
Geoff Mendal
ec36780b6a Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-13 14:41:28 +00:00
Geoff Mendal
011949c6aa Import translations. DO NOT MERGE 
Change-Id: I5a8416a5469b2c88197e0592ea660f38d7db233c
Auto-generated-cl: translation import
 2015-05-13 07:34:45 -07:00
Jason Monk
02f0a4aff3 Fix connecting to secure wifi from QS 
Sometimes the preference isn't created yet, so we need to hold on
to the ssid until the preference for that access point gets created.

Bug: 20975085
Change-Id: Ib5804611793550106f6059b1afe016de4e89bc64
 2015-05-13 10:17:33 -04:00
Amit Mahajan
4a70d1a14b am f76b732c: am f82cd8f4: Merge "Show only APNs belonging to carrier (mno/mvno) under apn settings." into mnc-dev 
* commit 'f76b732c18fe4696d2c97729848de5294c3c61f5':
  Show only APNs belonging to carrier (mno/mvno) under apn settings.
 2015-05-13 01:17:39 +00:00
Amit Mahajan
f76b732c18 am f82cd8f4: Merge "Show only APNs belonging to carrier (mno/mvno) under apn settings." into mnc-dev 
* commit 'f82cd8f4b3a533be352bdcee8cd29b6feb4df868':
  Show only APNs belonging to carrier (mno/mvno) under apn settings.
 2015-05-13 01:07:03 +00:00
Amit Mahajan
f82cd8f4b3 Merge "Show only APNs belonging to carrier (mno/mvno) under apn settings." into mnc-dev 2015-05-13 00:58:45 +00:00
Amit Mahajan
17b0c481e0 Show only APNs belonging to carrier (mno/mvno) under apn settings. 
Bug: 10719093
Change-Id: I942ce59995afffd395f7d73e4fd70674db0f643f
 2015-05-12 17:17:56 -07:00
Chad Brubaker
4844b41dce am eb0d52e7: am aeb09164: Merge "No longer upgrade password quality based on keystore" into mnc-dev 
* commit 'eb0d52e7cb44b2f1d18520e1d676662032becc16':
  No longer upgrade password quality based on keystore
 2015-05-12 21:39:11 +00:00
Chad Brubaker
eb0d52e7cb am aeb09164: Merge "No longer upgrade password quality based on keystore" into mnc-dev 
* commit 'aeb09164cc81432da04078c253a2adbe8dd51d3d':
  No longer upgrade password quality based on keystore
 2015-05-12 21:27:17 +00:00
Alan Viverette
111c1cd3e5 am 1e3f220b: am bdc4e534: Memory icon should use theme accent color as tint 
* commit '1e3f220b7df524922e07e7a611d520997e36098f':
  Memory icon should use theme accent color as tint
 2015-05-12 21:26:13 +00:00
Chad Brubaker
aeb09164cc Merge "No longer upgrade password quality based on keystore" into mnc-dev 2015-05-12 21:16:18 +00:00
Alan Viverette
1e3f220b7d am bdc4e534: Memory icon should use theme accent color as tint 
* commit 'bdc4e534ba2bbd5bc04f1046e5199251d54a9599':
  Memory icon should use theme accent color as tint
 2015-05-12 21:15:49 +00:00
Alan Viverette
bdc4e534ba Memory icon should use theme accent color as tint 
Change-Id: I9d338680db7df437ab87d66dcfd9ca23441a4f58
 2015-05-12 14:04:47 -07:00
Chad Brubaker
95e6fe0e21 No longer upgrade password quality based on keystore 
Keystore no longer requires a password to operate and only deletes
encrypted at rest entries when the user removes their password, so
blocking password downgrade is no longer required.

Bug: 20764363
Change-Id: I6f06acc71a4165282985082203ae1194491844c7
 2015-05-12 13:42:52 -07:00
Jason Monk
484eddd541 am c51c9848: am ce57d168: Merge "More updates to battery optimization whitelist" into mnc-dev 
* commit 'c51c98485c3fcc98b576121e4fc182846c41500c':
  More updates to battery optimization whitelist
 2015-05-12 20:30:32 +00:00
Jason Monk
c51c98485c am ce57d168: Merge "More updates to battery optimization whitelist" into mnc-dev 
* commit 'ce57d168624b6b10b235cb41374e862cca25a1f3':
  More updates to battery optimization whitelist
 2015-05-12 20:17:39 +00:00
Jason Monk
ce57d16862 Merge "More updates to battery optimization whitelist" into mnc-dev 2015-05-12 20:05:27 +00:00
Jason Monk
3bdb0d690e More updates to battery optimization whitelist 
Mostly just string updates.

Also fix crash in power details.

Bug: 19991702
Bug: 21027488
Bug: 21063077
Change-Id: I5a5e382a20ffaecd9eb16454906c985cc1510572
 2015-05-12 15:55:23 -04:00
Jason Monk
74176313c2 am 70ac19f8: am bb8f6e60: Merge "App info > storage updates" into mnc-dev 
* commit '70ac19f8039b7b073dd5be37ff4750b080a4e55d':
  App info > storage updates
 2015-05-12 19:42:36 +00:00
Jason Monk
70ac19f803 am bb8f6e60: Merge "App info > storage updates" into mnc-dev 
* commit 'bb8f6e606ab78783354cb8b8948b9bde7250446a':
  App info > storage updates
 2015-05-12 19:32:15 +00:00
Jason Monk
bb8f6e606a Merge "App info > storage updates" into mnc-dev 2015-05-12 19:20:38 +00:00
Jason Monk
c27f9e179a App info > storage updates 
- Fix button theme
 - Hide move dropdown when can't move
 - Cleanup by switching to using a horizontal preference layout, rather
   than custom layouts

Bug: 21060534
Change-Id: I2cc3ab4063ff6b4dfe873f9152b34130d702faae
 2015-05-12 14:58:09 -04:00