Xiyuan Xia
6cee8eae19
am ae900bc6
: am fe2cee7b
: am e2862a00
: Merge "Migrate settings UI to use async security check" into mnc-dev
...
* commit 'ae900bc65e9d724d255ee1602cc5868db7e4d837':
Migrate settings UI to use async security check
2015-05-13 17:56:57 +00:00
Jason Monk
9aff041588
am 921bda5c
: am 2863a945
: am a8dae2af
: Merge "Start app notifications as fragment not intent" into mnc-dev
...
* commit '921bda5c71905b30eae0834af3dcc0197a95578e':
Start app notifications as fragment not intent
2015-05-13 17:56:56 +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
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
Geoff Mendal
04342b3f5b
am c160e9a2
: (-s ours) am 453511fc
: (-s ours) am ec36780b
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'c160e9a2246f1b5d40ad05e4de562536bf615395':
Import translations. DO NOT MERGE
2015-05-13 15:38:31 +00:00
Jason Monk
56a847236d
am 28ab340c
: am 417c9b46
: am 02f0a4af
: Fix connecting to secure wifi from QS
...
* commit '28ab340c9d90c4898daecd5bc4c267d27583a81e':
Fix connecting to secure wifi from QS
2015-05-13 15:38:29 +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
Geoff Mendal
a287c8ebb0
Import translations. DO NOT MERGE
...
Change-Id: Icce0b46b679e33df1fb7cd069d01aaae5afeeea4
Auto-generated-cl: translation import
2015-05-13 06:58:02 -07:00
Amit Mahajan
46cda890df
am 4a70d1a1
: am f76b732c
: am f82cd8f4
: Merge "Show only APNs belonging to carrier (mno/mvno) under apn settings." into mnc-dev
...
* commit '4a70d1a14bb1f903ed6103246784c26d55ec1913':
Show only APNs belonging to carrier (mno/mvno) under apn settings.
2015-05-13 01:33:23 +00: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
a4a04e03a4
am 4844b41d
: am eb0d52e7
: am aeb09164
: Merge "No longer upgrade password quality based on keystore" into mnc-dev
...
* commit '4844b41dce0becb1b90695a4b9a3727afced050e':
No longer upgrade password quality based on keystore
2015-05-12 21:50:47 +00: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
Alan Viverette
e3b332dd42
am 111c1cd3
: am 1e3f220b
: am bdc4e534
: Memory icon should use theme accent color as tint
...
* commit '111c1cd3e542e6bdc4a6b66150bd647e5f607e8c':
Memory icon should use theme accent color as tint
2015-05-12 21:33: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
5ed7968cab
am 484eddd5
: am c51c9848
: am ce57d168
: Merge "More updates to battery optimization whitelist" into mnc-dev
...
* commit '484eddd5419d9fe293aefc5b47c275e3c1e81924':
More updates to battery optimization whitelist
2015-05-12 20:40:47 +00: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
5abebe6374
am 74176313
: am 70ac19f8
: am bb8f6e60
: Merge "App info > storage updates" into mnc-dev
...
* commit '74176313c23a10f7e23937dbc0de2a4c7646e7cc':
App info > storage updates
2015-05-12 20:00:51 +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
Maurice Lam
1060b172b3
am 830c02e9
: am f51a17e6
: am c988100c
: Merge "[WifiSetup] Use adjustResize for alert dialogs during Setup" into mnc-dev
...
* commit '830c02e94ee6ed16f57c227933fa8aade9ec6193':
[WifiSetup] Use adjustResize for alert dialogs during Setup
2015-05-12 18:28:19 +00:00
Maurice Lam
830c02e94e
am f51a17e6
: am c988100c
: Merge "[WifiSetup] Use adjustResize for alert dialogs during Setup" into mnc-dev
...
* commit 'f51a17e6d24c9e3b59c8e51057d1db7882999b7e':
[WifiSetup] Use adjustResize for alert dialogs during Setup
2015-05-12 18:17:34 +00:00
Maurice Lam
f51a17e6d2
am c988100c
: Merge "[WifiSetup] Use adjustResize for alert dialogs during Setup" into mnc-dev
...
* commit 'c988100c6e8c2f7eb1fb4133241132b91a987d81':
[WifiSetup] Use adjustResize for alert dialogs during Setup
2015-05-12 18:10:11 +00:00
Maurice Lam
c988100c6e
Merge "[WifiSetup] Use adjustResize for alert dialogs during Setup" into mnc-dev
2015-05-12 18:03:35 +00:00
Jason Monk
fb1e4aa2d7
am d818ce38
: am 775cb866
: am ee1a06ee
: Fix tuner key
...
* commit 'd818ce386911be4917ad166c807ff33073b05fd8':
Fix tuner key
2015-05-12 15:37:02 +00:00
Jason Monk
3c29f02a84
am 6790181d
: am b7ec58fb
: am 41f47bbc
: Merge "Add SystemUI Tuner Control" into mnc-dev
...
* commit '6790181dd79eac300009099116443ef73baae06d':
Add SystemUI Tuner Control
2015-05-12 15:37:01 +00:00