John Spurlock
7b9989773b
Merge "Settings: New DND access settings page." into mnc-dev
2015-05-08 22:28:55 +00:00
Chad Brubaker
2f23695ad5
am 1cfc32d1: am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev
...
* commit '1cfc32d1a59ab641bcb90425b6c5f2c221f14e23':
Track keystore password method changes
2015-05-08 22:22:03 +00:00
Chad Brubaker
1cfc32d1a5
am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev
...
* commit '69fb78e27b61c91d98a9c90a4680e35e72d0e73c':
Track keystore password method changes
2015-05-08 22:14:04 +00:00
Chad Brubaker
69fb78e27b
Merge "Track keystore password method changes" into mnc-dev
2015-05-08 21:51:12 +00:00
John Spurlock
33bf636e72
Settings: Use new EventInfo.ANY_CALENDAR constant.
...
Bug: 20064962
Change-Id: I08a8c5feb61bfd440fc6a297d97de4abba5b19b3
2015-05-08 17:37:23 -04:00
Jason Monk
e92d8d0789
am 060789f7: am cf2814be: am 173d658b: Merge "Button that goes from app info details to app info" into mnc-dev
...
* commit '060789f76d6a84857ac15f47fb1b2a9e6e2d6391':
Button that goes from app info details to app info
2015-05-08 20:21:28 +00:00
Jason Monk
060789f76d
am cf2814be: am 173d658b: Merge "Button that goes from app info details to app info" into mnc-dev
...
* commit 'cf2814bec405f61b5fa8d652a85e6d743734ecbb':
Button that goes from app info details to app info
2015-05-08 20:10:51 +00:00
Jason Monk
cf2814bec4
am 173d658b: Merge "Button that goes from app info details to app info" into mnc-dev
...
* commit '173d658babe0bcb6add829d1621550cebeed2296':
Button that goes from app info details to app info
2015-05-08 19:58:26 +00:00
Maurice Lam
342c74ed03
[LockScreenSetup] Fix "Choose Lock PIN" title
...
Set the header text for SetupChooseLockPassword in onViewCreated
after the superclass has set the activity title.
Bug: 20861117
Change-Id: I27e4f06d16afd9a02647f8c10a76518f618bd6b8
2015-05-08 12:51:51 -07:00
Jason Monk
173d658bab
Merge "Button that goes from app info details to app info" into mnc-dev
2015-05-08 19:47:29 +00:00
Jason Monk
8f600a4fbc
Button that goes from app info details to app info
...
This info button is shown on the header of all app detail pages.
This button is hidden when coming from app info, to avoid allowing
users to go in circles.
Since app notification details had a settings button where the new
info button goes, the app notification settings will move down to
be a preference (this matches the usage access screen UX).
Also fix a bug in launching app notification settings for managed
profiles.
Bug: 20633669
Change-Id: Idbb4f7c3326b4c6b0a19559b722ee0406eaba6c0
2015-05-08 15:35:46 -04:00
Jason Monk
beb92ce98f
am 8049bfae: am b8555ea9: am 9e1ea4b1: Merge "Choose correct network template for data history" into mnc-dev
...
* commit '8049bfae3f8c0fffb1217e782a1ea5b6755e971f':
Choose correct network template for data history
2015-05-08 18:44:05 +00:00
Jason Monk
8049bfae3f
am b8555ea9: am 9e1ea4b1: Merge "Choose correct network template for data history" into mnc-dev
...
* commit 'b8555ea90afb2ff1271f9a1a396eeb7d54211e71':
Choose correct network template for data history
2015-05-08 18:32:10 +00:00
Jason Monk
b8555ea90a
am 9e1ea4b1: Merge "Choose correct network template for data history" into mnc-dev
...
* commit '9e1ea4b121d200e4338bf271e832c3f2e3613b20':
Choose correct network template for data history
2015-05-08 18:21:47 +00:00
Jason Monk
9e1ea4b121
Merge "Choose correct network template for data history" into mnc-dev
2015-05-08 18:13:14 +00:00
John Spurlock
08531a81cb
Settings: New DND access settings page.
...
- New advanced notification settings subpage for managing apps
that have requested the ability to manage notification policy.
- Create new "Advanced" section at the bottom of notification settings
for this and the existing Notification access settings page.
Bug: 18298798
Change-Id: Ib415e634980d37d6492799f67a6619700ee2a01c
2015-05-08 13:57:22 -04:00
Jason Monk
23899e64ca
am 096d75f7: am 59687613: am 4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev
...
* commit '096d75f7b3ad16fb7bf4da4b4249e4e91a069d22':
Fix crash on unistalling app
2015-05-08 17:50:34 +00:00
Jason Monk
096d75f7b3
am 59687613: am 4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev
...
* commit '59687613049588d4d09af0a8f5e5da5287a14657':
Fix crash on unistalling app
2015-05-08 17:37:11 +00:00
Jason Monk
5968761304
am 4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev
...
* commit '4d1efa0e6da65f20f1baf827abee97df6551c277':
Fix crash on unistalling app
2015-05-08 17:24:09 +00:00
Jason Monk
4d1efa0e6d
Merge "Fix crash on unistalling app" into mnc-dev
2015-05-08 17:16:41 +00:00
Jason Monk
1659e70207
am da0f2a78: am 4ba24b92: am 7ef58584: Merge "Fix crash in settings -> apps after adding profile" into mnc-dev
...
* commit 'da0f2a782ea2a83a8f4c074d085d9460013cb203':
Fix crash in settings -> apps after adding profile
2015-05-08 16:59:51 +00:00
Erik Kline
d69572531a
am 16aa45ad: am 3704367e: am c0df6623: Merge "Add settings for persisting the mobile data connection." into mnc-dev
...
* commit '16aa45ad50121f9aa9c09174b87011140ceeb6e6':
Add settings for persisting the mobile data connection.
2015-05-08 16:59:49 +00:00
Yohei Yukawa
e06b846ed3
am 876dd465: am 4053c047: am 6a03d113: Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev
...
* commit '876dd465fb7060e17cd0674159e3d32d5e8dda43':
Making the behavior deterministic when the IME picker is shown.
2015-05-08 16:59:47 +00:00
Fabrice Di Meglio
c805c2a171
am 3d758c0a: am 76215816: am 99245d13: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
...
* commit '3d758c0ab0ffc50837ab493d3d4a1cbb772b73fd':
Add user selectable Default Browser feature - part 4
2015-05-08 16:59:45 +00:00
Jason Monk
da0f2a782e
am 4ba24b92: am 7ef58584: Merge "Fix crash in settings -> apps after adding profile" into mnc-dev
...
* commit '4ba24b92c75d80847247432044bd3a86c3154641':
Fix crash in settings -> apps after adding profile
2015-05-08 16:40:37 +00:00
Erik Kline
16aa45ad50
am 3704367e: am c0df6623: Merge "Add settings for persisting the mobile data connection." into mnc-dev
...
* commit '3704367ec32a3d80014e20ff372fd24d937c118c':
Add settings for persisting the mobile data connection.
2015-05-08 16:40:22 +00:00
Yohei Yukawa
876dd465fb
am 4053c047: am 6a03d113: Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev
...
* commit '4053c047f2dd818a663f8938fa896a6c4f933ec7':
Making the behavior deterministic when the IME picker is shown.
2015-05-08 16:38:40 +00:00
Fabrice Di Meglio
3d758c0ab0
am 76215816: am 99245d13: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
...
* commit '7621581682e595ce610d8a3a7e70ce7c483ad01b':
Add user selectable Default Browser feature - part 4
2015-05-08 16:38:11 +00:00
Jason Monk
a9862cae7a
Fix crash on unistalling app
...
Only update the battery info if the app exists.
Bug: 20918104
Change-Id: I61481be53cfc72d49868f14a940a09c83f7a5cc2
2015-05-08 11:37:01 -04:00
Jason Monk
10e1a94ef7
Choose correct network template for data history
...
Bug: 19921796
Change-Id: I90376ed0314c47fcbee21c81b85f60d3cc3312a6
2015-05-08 11:24:03 -04:00
Jason Monk
4ba24b92c7
am 7ef58584: Merge "Fix crash in settings -> apps after adding profile" into mnc-dev
...
* commit '7ef58584e66e077ee7930ae100cc1a1915cd7b1a':
Fix crash in settings -> apps after adding profile
2015-05-08 14:59:42 +00:00
Jason Monk
7ef58584e6
Merge "Fix crash in settings -> apps after adding profile" into mnc-dev
2015-05-08 14:48:54 +00:00
Jason Monk
e4ccf87839
Fix crash in settings -> apps after adding profile
...
Bug: 20652411
Change-Id: I766f99ee520ab106ec2765c77057042ed14e8fed
2015-05-08 10:18:48 -04:00
Erik Kline
3704367ec3
am c0df6623: Merge "Add settings for persisting the mobile data connection." into mnc-dev
...
* commit 'c0df6623a0eb0ebbdb965111269b96d9f4a4b976':
Add settings for persisting the mobile data connection.
2015-05-08 09:23:38 +00:00
Erik Kline
c0df6623a0
Merge "Add settings for persisting the mobile data connection." into mnc-dev
2015-05-08 08:12:21 +00:00
Yohei Yukawa
4053c047f2
am 6a03d113: Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev
...
* commit '6a03d11328da5f2ce7c685f613d706fbfa589fdd':
Making the behavior deterministic when the IME picker is shown.
2015-05-07 23:28:11 +00:00
Yohei Yukawa
6a03d11328
Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev
2015-05-07 23:20:27 +00:00
Seigo Nonaka
e792729b4c
Making the behavior deterministic when the IME picker is shown.
...
In the language & input settings, the auxiliary IME subtypes have been
hidden since they should not be a default. With Id156c85535a22, now we
can explicitly control the behavior of input method picker.
Note the this CL should not change any user visible behaviors.
Bug: 20763994
Change-Id: I9f797d07ba02363fab58ceb9aecb3cc11fbc407e
2015-05-07 23:18:49 +00:00
Chad Brubaker
7236f2abba
Track keystore password method changes
...
Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
2015-05-07 16:14:51 -07:00
Fabrice Di Meglio
7621581682
am 99245d13: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
...
* commit '99245d13e9ac2fabe1300929a3a669f1d186070e':
Add user selectable Default Browser feature - part 4
2015-05-07 22:47:47 +00:00
Fabrice Di Meglio
99245d13e9
Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
2015-05-07 22:37:06 +00:00
Fabrice Di Meglio
00b5a67a2e
Add user selectable Default Browser feature - part 4
...
- refresh Browser list depending on package installation / removal
See bug #20144393
Change-Id: I529f6e0bd8b5bd4cae1dea9479acfca9cf9a6b26
2015-05-07 15:34:21 -07:00
Raju Yadav
aebb46e0d7
am 85472aa0: am 787f00f9: am 92331e51: Avoid SElinux denial accessing IMEI information
...
* commit '85472aa039c4b4b355c7da217451cbfd54b7fa52':
Avoid SElinux denial accessing IMEI information
2015-05-07 22:12:15 +00:00
Jason Monk
bf304bdc27
am f86cddb3: am 62b8ffae: am 97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev
...
* commit 'f86cddb3efea728c1464c1a04b0a7425d1546821':
Detect uninstalled apps during resume
2015-05-07 22:07:34 +00:00
Raju Yadav
85472aa039
am 787f00f9: am 92331e51: Avoid SElinux denial accessing IMEI information
...
* commit '787f00f99255b63176f599b3e6c5ff13b48cf884':
Avoid SElinux denial accessing IMEI information
2015-05-07 21:21:15 +00:00
Raju Yadav
787f00f992
am 92331e51: Avoid SElinux denial accessing IMEI information
...
* commit '92331e51eadb717a15626083b52a820c236dc1cd':
Avoid SElinux denial accessing IMEI information
2015-05-07 21:09:22 +00:00
Jason Monk
f86cddb3ef
am 62b8ffae: am 97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev
...
* commit '62b8ffaec80eef1c2b0060cc2128b45dfc0bea28':
Detect uninstalled apps during resume
2015-05-07 20:59:36 +00:00
Raju Yadav
92331e51ea
Avoid SElinux denial accessing IMEI information
...
Set persistent attribute to false so preferences are not
stored in shared preferences, this avoids the SElinux
denial:
W/SharedPreferenc( 6950): type=1400 audit(0.0:4): avc: \
denied { search } for name="com.android.settings" \
dev="mmcblk0p25" ino=48929 scontext=u:r:radio:s0 \
tcontext=u:object_r:system_app_data_file:s0 tclass=dir\
op_res=-13 ppid=319 pcomm="main" tgid=1589\
tgcomm="m.android.phone"
Observed when entering IMEI information in:
Settings > About Phone > Status > IMEI information.
It makes no sense to store this information in shared
preferences anyway so no functinoality is lost with this
change.
(cherrypicked from commit b2ad5bb522
2015-05-07 13:54:54 -07:00
Jason Monk
62b8ffaec8
am 97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev
...
* commit '97cebec1a0975e1a85a4bbb0024e403c655722a8':
Detect uninstalled apps during resume
2015-05-07 20:45:40 +00:00
Jason Monk
97cebec1a0
Merge "Detect uninstalled apps during resume" into mnc-dev
2015-05-07 20:36:17 +00:00
