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
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
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
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
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
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
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
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
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
775cb866ec
am ee1a06ee
: Fix tuner key
...
* commit 'ee1a06eee3ba73c0382332eae98a14fbacffa352':
Fix tuner key
2015-05-12 15:14:25 +00:00
Jason Monk
b7ec58fbd4
am 41f47bbc
: Merge "Add SystemUI Tuner Control" into mnc-dev
...
* commit '41f47bbcb301ebdf27069ccb76395d303bf17144':
Add SystemUI Tuner Control
2015-05-12 15:14:23 +00:00
Jason Monk
ee1a06eee3
Fix tuner key
...
Change-Id: I4bddf218dc34516134bd190ebf8c0f1c7b1a6544
2015-05-12 11:10:52 -04:00
Jason Monk
41f47bbcb3
Merge "Add SystemUI Tuner Control" into mnc-dev
2015-05-12 15:03:41 +00:00
Jason Monk
49851ac32a
Add SystemUI Tuner Control
...
Change-Id: I321c3263612c752409beb46f4c96826954b96e26
2015-05-12 11:01:17 -04:00
Jason Monk
acc731ada8
am fa9d2791
: Merge "Add tap to wake setting" into mnc-dev
...
* commit 'fa9d27918df47220802678055421beb9fbfdaf50':
Add tap to wake setting
2015-05-12 14:44:41 +00:00
Jason Monk
fa9d27918d
Merge "Add tap to wake setting" into mnc-dev
2015-05-12 14:35:17 +00:00
Hemanth kumar B
f939487cfc
am 370e44d7
: Avoid SElinux denial accessing SIM card lock
...
* commit '370e44d72d7ff6d5ed36bbfe4fd1272c74bf5f52':
Avoid SElinux denial accessing SIM card lock
2015-05-11 20:26:44 +00:00
Hemanth kumar B
370e44d72d
Avoid SElinux denial accessing SIM card lock
...
This change avoids the following SELinux denial:
W/SharedPreferenc(28238): type=1400 audit(0.0:8): avc: denied\
{ search } for name="com.android.settings" dev="mmcblk0p25"\
ino=8209 scontext=u:r:radio:s0 tcontext=u:object_r:system_app\
_data_file:s0 tclass=dir op_res=-13 ppid=318 pcomm="main"\
tgid=1850 tgcomm="m.android.phone"
When accessing Settings->Security->Set up SIM card lock.
There is really no need to store this information in
SharedPreferences anyway.
(cherrypicked from commit bef7221a7d
)
Change-Id: I3ba30d5d5e2c5b3c379397fbb06325101acaf490
2015-05-11 13:12:26 -07:00
Jason Monk
72683a5152
am c24d0e1f
: Merge "Update strings for ignore optimizations control" into mnc-dev
...
* commit 'c24d0e1fcc6ad1b4da39c00094289e71ab9da3a3':
Update strings for ignore optimizations control
2015-05-11 20:10:55 +00:00
Jason Monk
c24d0e1fcc
Merge "Update strings for ignore optimizations control" into mnc-dev
2015-05-11 20:03:46 +00:00
Jason Monk
bcb4f2c913
Update strings for ignore optimizations control
...
Bug: 19991702
Change-Id: Ie5b54fd70176cfceb8b88cf18a9974321ba84c28
2015-05-11 16:01:21 -04:00
Barnaby James
cea2cf43c4
am 9331b9fa
: Merge "Simplify Zen mode voice activity." into mnc-dev
...
* commit '9331b9fa0d416b80423b1200a80349be77463c65':
Simplify Zen mode voice activity.
2015-05-11 18:26:36 +00:00
Barnaby James
9331b9fa0d
Merge "Simplify Zen mode voice activity." into mnc-dev
2015-05-11 18:15:03 +00:00
Barnaby James
0474b723e1
Simplify Zen mode voice activity.
...
Zen mode voice activity now only sets the notification mode to alarms mode
or off. A duration may be specified if it was in the original intent.
Change-Id: Ica472ca9c6dcbce473832f4f922baf225df4951b
Bug: 21024455
2015-05-11 09:20:54 -07:00
Geoff Mendal
671371e5b4
am bff0f290
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'bff0f2905fd8128f49ff78bd9f15e81e97281c91':
Import translations. DO NOT MERGE
2015-05-11 16:14:58 +00:00
Geoff Mendal
bff0f2905f
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-11 16:10:13 +00:00
John Spurlock
88be59ea38
am b8099f54
: Settings: Migrate notification access screens to switch prefs.
...
* commit 'b8099f542c21e3ac57d250837e60ec65653ab55c':
Settings: Migrate notification access screens to switch prefs.
2015-05-11 15:58:51 +00:00
John Spurlock
b8099f542c
Settings: Migrate notification access screens to switch prefs.
...
Bug: 20916418
Change-Id: I729bc3a6f853f15780f12e7d7c9f337447e399c4
2015-05-11 11:47:21 -04:00
Chris Wren
cf3b4e2edc
am 46c8f759
: Merge "log more settings actions" into mnc-dev
...
* commit '46c8f759fdad71380504ad61a49031331ea39004':
log more settings actions
2015-05-11 15:17:15 +00:00