OSDN Git Service
Billy Lau [Fri, 17 Jul 2015 18:57:51 +0000 (18:57 +0000)]
am
e104fced: am
90a8a01b: Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '
e104fced18056905286ee01a3ef8c3d12f2b9e4d':
Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Billy Lau [Fri, 17 Jul 2015 18:39:23 +0000 (18:39 +0000)]
am
90a8a01b: Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '
90a8a01b629694d28dd7e40a8f0253894fc14e02':
Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Billy Lau [Fri, 17 Jul 2015 18:28:27 +0000 (18:28 +0000)]
Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
Billy Lau [Thu, 16 Jul 2015 02:50:47 +0000 (03:50 +0100)]
Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Overall, fixed the detection of the state of permission in the corresponding UX
to be more accurate. Also ensured that apps can actually launch the summary UX
through a custom intent.
AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.
strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.
Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
Christopher Tate [Fri, 17 Jul 2015 00:04:04 +0000 (00:04 +0000)]
am
649cc87f: am
ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '
649cc87f994c0010e8fd7567b7cece77ffffb0fd':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Christopher Tate [Thu, 16 Jul 2015 23:50:06 +0000 (23:50 +0000)]
am
ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '
ddaa142a094a404d7c5e6d7eea93920f8ed16696':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Christopher Tate [Thu, 16 Jul 2015 23:00:49 +0000 (16:00 -0700)]
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Bug
22504009
Change-Id: I19ded70cf17936504a2a1becea2684d87952dff6
Kenny Guy [Thu, 16 Jul 2015 13:15:57 +0000 (13:15 +0000)]
am
29d1b0d0: am
705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit '
29d1b0d0f4e7760ee1ed317b303a6c4ec54adda7':
Show disabled trust agents as off.
Kenny Guy [Thu, 16 Jul 2015 13:02:44 +0000 (13:02 +0000)]
am
705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit '
705faddbb37bbaa8dc7a18ab3290c02b5b6a2a2c':
Show disabled trust agents as off.
Kenny Guy [Thu, 16 Jul 2015 12:42:39 +0000 (12:42 +0000)]
Merge "Show disabled trust agents as off." into mnc-dev
Sanket Padawe [Thu, 16 Jul 2015 05:27:44 +0000 (05:27 +0000)]
am
c5be2243: am
046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '
c5be2243d79ea0a27a7c61ee3aeffdacd7f63b06':
Use common xml file for multi-tab settings.
Sanket Padawe [Thu, 16 Jul 2015 05:14:09 +0000 (05:14 +0000)]
am
046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '
046decca29376aba5b97b78900bfd867ca3f310c':
Use common xml file for multi-tab settings.
Sanket Padawe [Thu, 16 Jul 2015 05:01:06 +0000 (05:01 +0000)]
Merge "Use common xml file for multi-tab settings." into mnc-dev
Maurice Lam [Thu, 16 Jul 2015 02:43:11 +0000 (02:43 +0000)]
am
021b3d95: am
bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '
021b3d955f91eeaa03f8f45401663954560dc748':
[Fingerprint] Use accent color for fingerprint highlight
Maurice Lam [Thu, 16 Jul 2015 02:28:09 +0000 (02:28 +0000)]
am
bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '
bec1d295586b752f81f523c8339dcd49c586d722':
[Fingerprint] Use accent color for fingerprint highlight
Maurice Lam [Thu, 16 Jul 2015 02:19:18 +0000 (02:19 +0000)]
Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 23:20:43 +0000 (23:20 +0000)]
am
194e92d3: am
50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '
194e92d3a0dcc15056fac17690f2f36bdc96861a':
Disable ignore battery optimization items that can't change
Jason Monk [Wed, 15 Jul 2015 23:20:41 +0000 (23:20 +0000)]
am
7beb763d: am
4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '
7beb763da239fb71f214cab0587ae52f383985fc':
Change move storage from dropdown pref to dialog
Jason Monk [Wed, 15 Jul 2015 23:03:58 +0000 (23:03 +0000)]
am
50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '
509726054a3efc09d65d6c15f485ea6f1da2d272':
Disable ignore battery optimization items that can't change
Jason Monk [Wed, 15 Jul 2015 23:03:57 +0000 (23:03 +0000)]
am
4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '
4a6b909559d50e02833afd5119876df070dfd458':
Change move storage from dropdown pref to dialog
Jason Monk [Wed, 15 Jul 2015 22:48:12 +0000 (22:48 +0000)]
Merge "Disable ignore battery optimization items that can't change" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 22:48:05 +0000 (22:48 +0000)]
Merge "Change move storage from dropdown pref to dialog" into mnc-dev
Maurice Lam [Wed, 15 Jul 2015 22:32:46 +0000 (22:32 +0000)]
am
77352c65: am
4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '
77352c65be3d4106da93609794610d88347e069b':
[Fingerprint] Add fingerprint enroll in setup wizard
Jim Miller [Wed, 15 Jul 2015 22:32:45 +0000 (22:32 +0000)]
am
22e51c8b: am
6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit '
22e51c8b4f6622cc160d8652b8abe9db304b9a5a':
Fixed the layout for the fingerprint renaming
Maurice Lam [Wed, 15 Jul 2015 22:32:43 +0000 (22:32 +0000)]
am
e63322f6: resolved conflicts for merge of
f90628c6 to mnc-dr-dev
* commit '
e63322f640cf955ba296e064b07e4920d334f851':
[Fingerprint] Export FingerprintEnrollIntroduction
Maurice Lam [Wed, 15 Jul 2015 22:26:51 +0000 (22:26 +0000)]
am
4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '
4595978b72eda7ed53ce0c0cbb763bed02ea13ab':
[Fingerprint] Add fingerprint enroll in setup wizard
Jim Miller [Wed, 15 Jul 2015 22:26:50 +0000 (22:26 +0000)]
am
6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit '
6b9d788914a600917e8edd4ecd502d6ccf87ca12':
Fixed the layout for the fingerprint renaming
Maurice Lam [Wed, 15 Jul 2015 21:57:06 +0000 (14:57 -0700)]
resolved conflicts for merge of
f90628c6 to mnc-dr-dev
Change-Id: I3b0729b1d00a4ca25d3a7127e27b4fc3a062d30d
Jason Monk [Wed, 15 Jul 2015 17:04:59 +0000 (13:04 -0400)]
Change move storage from dropdown pref to dialog
Use a horizontal pref and a single button that triggers the dialog
Bug:
21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
Maurice Lam [Wed, 15 Jul 2015 19:28:05 +0000 (19:28 +0000)]
Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 19:22:38 +0000 (15:22 -0400)]
Disable ignore battery optimization items that can't change
Bug:
22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
Jim Miller [Wed, 15 Jul 2015 19:18:05 +0000 (19:18 +0000)]
Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
Maurice Lam [Wed, 15 Jul 2015 18:45:33 +0000 (18:45 +0000)]
Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
Maurice Lam [Thu, 9 Jul 2015 23:38:37 +0000 (16:38 -0700)]
[Fingerprint] Add fingerprint enroll in setup wizard
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.
On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.
Bug:
21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
Maurice Lam [Wed, 8 Jul 2015 23:59:59 +0000 (16:59 -0700)]
[Fingerprint] Export FingerprintEnrollIntroduction
Export FingerprintEnrollIntroduction activity under the permission
MANAGE_FINGERPRINT so that setup wizard can start it.
Bug:
21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
(cherry picked from commit
052297172e33ec906a5da10a953be811ff60731c)
Selim Cinek [Wed, 8 Jul 2015 21:09:10 +0000 (14:09 -0700)]
Fixed the layout for the fingerprint renaming
Bug:
21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
(cherry picked from commit
abd67de1ad3f265f217491b0e8b21819cfdcdcbe)
Kenny Guy [Wed, 15 Jul 2015 14:54:38 +0000 (15:54 +0100)]
Show disabled trust agents as off.
When trust agents are disabled by the admin
show the greyed out toggle as off.
Bug:
22397930
Change-Id: I687a5dee0ca9bed5015a4af080270f7bafa5a37d
Jason Monk [Wed, 15 Jul 2015 15:22:19 +0000 (15:22 +0000)]
am
b6cb215c: am
cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '
b6cb215cbefc803b0a1510a7f7c606d4d5c10045':
Fix Help menu for PrivateVolumeSettings
Jason Monk [Wed, 15 Jul 2015 15:08:44 +0000 (15:08 +0000)]
am
cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '
cd075edf6dcff9ca9ff243760e032190acbdecdc':
Fix Help menu for PrivateVolumeSettings
Jason Monk [Wed, 15 Jul 2015 14:54:02 +0000 (14:54 +0000)]
Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 14:35:26 +0000 (14:35 +0000)]
am
78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
78aeabe834c6efacbbb7712bdbdd100917e356f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:16:17 +0000 (14:16 +0000)]
am
4c60755b: (-s ours) am
f3907176: (-s ours) Import translations. DO NOT MERGE
* commit '
4c60755b310dfb54a1eb748fe184f6e928295b3d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:15:33 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 15 Jul 2015 14:14:40 +0000 (07:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I451d2757ef702a046bc62ee5940e510fa0b739ee
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 14:07:41 +0000 (14:07 +0000)]
am
f3907176: (-s ours) Import translations. DO NOT MERGE
* commit '
f3907176da3f17397f61bf48ba90ab08a9cd85f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 13:56:45 +0000 (06:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0bd7d5fb307ffa5fd3b001eaf5cf7697168e90d6
Auto-generated-cl: translation import
xinhe [Tue, 14 Jul 2015 23:26:08 +0000 (23:26 +0000)]
am
7e23bae6: am
d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '
7e23bae6c6d8697c1f53ed4a3b8b467d3142fd76':
Need to disable 5GHz bands for WiFi tethering in Japan
xinhe [Tue, 14 Jul 2015 23:13:03 +0000 (23:13 +0000)]
am
d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '
d7fb46de591943c402dd13551ca603081ac4e6a7':
Need to disable 5GHz bands for WiFi tethering in Japan
xinhe [Tue, 14 Jul 2015 22:29:17 +0000 (22:29 +0000)]
Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
xinhe [Mon, 13 Jul 2015 22:26:45 +0000 (15:26 -0700)]
Need to disable 5GHz bands for WiFi tethering in Japan
b/
22396383
Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
Jim Miller [Tue, 14 Jul 2015 21:33:14 +0000 (21:33 +0000)]
am
a41eb2fa: am
e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
* commit '
a41eb2faaa4f86b77fe6fa2273f4a84216b5920c':
Postpone call to postEnroll() until we actually leave activity.
Jim Miller [Tue, 14 Jul 2015 21:18:39 +0000 (21:18 +0000)]
am
e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
* commit '
e641e7d706095b54ac89f6fcb58c66e2190f46c7':
Postpone call to postEnroll() until we actually leave activity.
Jim Miller [Tue, 14 Jul 2015 21:02:00 +0000 (21:02 +0000)]
Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
Jason Monk [Tue, 14 Jul 2015 20:47:33 +0000 (20:47 +0000)]
am
fd44d346: am
acc70a3a: Merge "Add content description to wifi networks" into mnc-dev
* commit '
fd44d346bcaae6e8267aa4767ad70037d436e1e4':
Add content description to wifi networks
Jason Monk [Tue, 14 Jul 2015 20:30:19 +0000 (20:30 +0000)]
am
acc70a3a: Merge "Add content description to wifi networks" into mnc-dev
* commit '
acc70a3a3262aef48b2efab90f14328f818a9aef':
Add content description to wifi networks
Jason Monk [Tue, 14 Jul 2015 20:20:31 +0000 (20:20 +0000)]
Merge "Add content description to wifi networks" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 19:00:22 +0000 (15:00 -0400)]
Fix Help menu for PrivateVolumeSettings
Call super.onCreateOptionsMenu so that the auto help stuff can
work properly.
Bug:
22202745
Change-Id: Iee6b4a81574c7e981290465a78641f3c5b06c143
Billy Lau [Tue, 14 Jul 2015 18:51:58 +0000 (18:51 +0000)]
am
de784e6a: am
52df60d8: Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
* commit '
de784e6ab5e86eb780cdeee4a2f01e2db9a1ef07':
Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
Billy Lau [Tue, 14 Jul 2015 18:36:53 +0000 (18:36 +0000)]
am
52df60d8: Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
* commit '
52df60d83dc48818aacbe1721e6aaa9be39e8451':
Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
Billy Lau [Tue, 14 Jul 2015 18:22:29 +0000 (18:22 +0000)]
Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
Sanket Padawe [Tue, 14 Jul 2015 18:13:43 +0000 (11:13 -0700)]
Use common xml file for multi-tab settings.
Bug:
22360525
Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
Jorim Jaggi [Tue, 14 Jul 2015 18:13:27 +0000 (18:13 +0000)]
am
464e54f8: am
8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev
* commit '
464e54f88b4aa933a7d26cb1afecf0ddfc282751':
Disable voice input if assist is voice service
Wei Liu [Tue, 14 Jul 2015 18:08:32 +0000 (18:08 +0000)]
Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev
Jorim Jaggi [Tue, 14 Jul 2015 18:04:11 +0000 (18:04 +0000)]
am
8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev
* commit '
8505d4a51d1112ea71f7df680cf85378a9567bde':
Disable voice input if assist is voice service
Jason Monk [Tue, 14 Jul 2015 18:00:07 +0000 (14:00 -0400)]
Add content description to wifi networks
Bug:
22468835
Change-Id: Ifd9d0384030befbd221b14599159348bf56d41c8
Jorim Jaggi [Tue, 14 Jul 2015 17:50:32 +0000 (17:50 +0000)]
Merge "Disable voice input if assist is voice service" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 14:18:00 +0000 (14:18 +0000)]
am
19186edd: am
7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev
* commit '
19186edddb32efc43e7f00faea0436c36b702290':
Disable notification volume when user restricted
Jason Monk [Tue, 14 Jul 2015 14:02:27 +0000 (14:02 +0000)]
am
7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev
* commit '
7713fe26d2151a7ba8e9970d90f55ae184d48b7d':
Disable notification volume when user restricted
Jason Monk [Tue, 14 Jul 2015 13:53:28 +0000 (13:53 +0000)]
Merge "Disable notification volume when user restricted" into mnc-dev
Martijn Coenen [Tue, 14 Jul 2015 10:13:58 +0000 (10:13 +0000)]
am
35738049: am
8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
* commit '
35738049df5aa6b14ef0721375cf40c5e7c60539':
Fix up Tap and Pay how it works.
Martijn Coenen [Tue, 14 Jul 2015 07:57:35 +0000 (07:57 +0000)]
am
8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
* commit '
8d9bb1ae1d551699ba85061001ced90a157ae9ad':
Fix up Tap and Pay how it works.
Martijn Coenen [Tue, 14 Jul 2015 07:44:58 +0000 (07:44 +0000)]
Merge "Fix up Tap and Pay how it works." into mnc-dev
Jorim Jaggi [Fri, 10 Jul 2015 23:48:37 +0000 (16:48 -0700)]
Disable voice input if assist is voice service
Bug:
22358252
Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
Maurice Lam [Fri, 10 Jul 2015 00:16:35 +0000 (17:16 -0700)]
[Fingerprint] Use accent color for fingerprint highlight
Set the fingerprint activated color, while registering a new
fingerprint to be 50% alpha of the accent color. This allows the
color to be changed with the theme, so that it will be highlighted
blue during setup wizard.
Bug:
21695577
Change-Id: Iee68506a4fbb8e8996bdb52694992ac460ae943d
Jason Monk [Mon, 13 Jul 2015 23:34:50 +0000 (23:34 +0000)]
am
5250cc00: am
53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit '
5250cc0007291bd946d6ac582d34af3440a8392f':
Fix app icon size
Sanket Padawe [Mon, 13 Jul 2015 23:34:48 +0000 (23:34 +0000)]
am
2db9291e: am
7995ca41: Use same technology type for LTE/4G
* commit '
2db9291ea4ba1d880ebcc976c65b12dd24d080ad':
Use same technology type for LTE/4G
Chris Wren [Mon, 13 Jul 2015 23:34:47 +0000 (23:34 +0000)]
am
b6d8b5f6: am
2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
* commit '
b6d8b5f6a4dfd5838f9e35d9ddd840e80f5bfec6':
import new view enums into MetricsLogger
Geoff Mendal [Mon, 13 Jul 2015 23:34:46 +0000 (23:34 +0000)]
am
d8b05ce2: (-s ours) am
536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
d8b05ce25f1f4c3d0686b4a45f8c5ba8bcec6fbb':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Mon, 13 Jul 2015 23:34:45 +0000 (23:34 +0000)]
am
c968c407: am
098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit '
c968c407f809f06dda02dffe25ea2a4ee9f4cb15':
Do not throw exception when MeasurementDetails.mediaSize is empty
Geoff Mendal [Mon, 13 Jul 2015 23:34:44 +0000 (23:34 +0000)]
am
92a33ff7: (-s ours) am
da15ade8: (-s ours) Import translations. DO NOT MERGE
* commit '
92a33ff73e5447fe89ed091e96efb07f8e6cfcfd':
Import translations. DO NOT MERGE
Jason Monk [Mon, 13 Jul 2015 23:01:59 +0000 (23:01 +0000)]
am
53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit '
53dd1d4deea9968f1255018248ff0393252032dd':
Fix app icon size
Sanket Padawe [Mon, 13 Jul 2015 23:01:45 +0000 (23:01 +0000)]
am
7995ca41: Use same technology type for LTE/4G
* commit '
7995ca4165cae43b9bff25a6e6eafdb51445b698':
Use same technology type for LTE/4G
Chris Wren [Mon, 13 Jul 2015 23:01:29 +0000 (23:01 +0000)]
am
2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
* commit '
2f8bb8ea97e87cacbe307c1d78fa7a6e096530eb':
import new view enums into MetricsLogger
Geoff Mendal [Mon, 13 Jul 2015 23:01:18 +0000 (23:01 +0000)]
am
536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
536ed1847863776335576699cdbe828b62f35a0f':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Mon, 13 Jul 2015 23:01:11 +0000 (23:01 +0000)]
am
098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit '
098c296df2388bbcc906e8e149743eea7467b0a8':
Do not throw exception when MeasurementDetails.mediaSize is empty
Geoff Mendal [Mon, 13 Jul 2015 23:00:39 +0000 (23:00 +0000)]
am
da15ade8: (-s ours) Import translations. DO NOT MERGE
* commit '
da15ade8300bb875b8d874e1f68032f6ffe95719':
Import translations. DO NOT MERGE
Jim Miller [Mon, 13 Jul 2015 22:58:59 +0000 (15:58 -0700)]
Postpone call to postEnroll() until we actually leave activity.
The existing code was calling postEnroll() too soon, which resulted
in the inability to add more than one fingerprint. The solution is to
only call postEnroll() when we're leaving the activity.
Fixes bug
22438498
Change-Id: Ia134899e12b4edc9cced834e99cb2bfd2d51321f
Maurice Lam [Mon, 13 Jul 2015 22:34:42 +0000 (22:34 +0000)]
am
c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
* commit '
c6178ba01236b60e90cc993103c633ea7eca299d':
[Fingerprint] Export FingerprintEnrollIntroduction
Billy Lau [Fri, 3 Jul 2015 16:01:18 +0000 (17:01 +0100)]
Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.
Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.
Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
Maurice Lam [Mon, 13 Jul 2015 20:20:56 +0000 (20:20 +0000)]
Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
Jason Monk [Mon, 13 Jul 2015 19:15:36 +0000 (15:15 -0400)]
Disable notification volume when user restricted
Bug:
22327825
Change-Id: I892627e00d9ebe2cd67348ce6da3c9c7bc0251fc
Wei Liu [Mon, 13 Jul 2015 19:01:42 +0000 (12:01 -0700)]
Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
Change-Id: Id6189e600eb2adb67f31d079a5a5ecfc99addccc
Jason Monk [Mon, 13 Jul 2015 18:05:53 +0000 (18:05 +0000)]
Merge "Fix app icon size" into mnc-dev
Sanket Padawe [Mon, 13 Jul 2015 17:15:41 +0000 (10:15 -0700)]
Use same technology type for LTE/4G
Though status bar and preferred network type show 4G, still show
LTE in SIM status when device set config_show4GForLTE true
Bug:
22213113
Change-Id: I2866a868992af7b4eb661d693a0cce60bb1b3402
Chris Wren [Mon, 13 Jul 2015 16:21:21 +0000 (16:21 +0000)]
Merge "import new view enums into MetricsLogger" into mnc-dev
Jason Monk [Mon, 13 Jul 2015 16:18:43 +0000 (12:18 -0400)]
Fix app icon size
Bug:
22425103
Change-Id: I35b3476eb75d221e5f244702534d4475b2c5921e
Geoff Mendal [Mon, 13 Jul 2015 15:11:43 +0000 (15:11 +0000)]
am
a52bf201: (-s ours) Import translations. DO NOT MERGE
* commit '
a52bf2017292a6da41d9b6950a1564710a94367e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:10:40 +0000 (15:10 +0000)]
am
7174a3d7: (-s ours) Import translations. DO NOT MERGE
* commit '
7174a3d7011fa4456bebe7e7b55f47aaed013d29':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 14:08:00 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I75a6759a8ccd3a922121912e0c2bdb291fda3e56
Auto-generated-cl: translation import
Geoff Mendal [Mon, 13 Jul 2015 13:54:00 +0000 (13:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev