Jorim Jaggi
222aeaf301
am 18dea40e
: am 1b730cb7
: am 434d55e5
: am 23ace013
: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '18dea40e2d755fbec2f028682c2754be4999183a':
Adjustments for find sensor screen
2015-07-29 22:56:34 +00:00
Geoff Mendal
f273d91741
am 53f771d8
: (-s ours) Import translations. DO NOT MERGE
...
* commit '53f771d8218c553248d0954fba2f25b4257838b2':
Import translations. DO NOT MERGE
2015-07-29 22:50:48 +00:00
Jorim Jaggi
18dea40e2d
am 1b730cb7
: am 434d55e5
: am 23ace013
: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '1b730cb77eb44e9e6938e11fe19522dcd909ec2f':
Adjustments for find sensor screen
2015-07-29 22:39:34 +00:00
Geoff Mendal
53f771d821
Import translations. DO NOT MERGE
...
Change-Id: I959a8c52fd330769880fd9b41894e404865a951e
Auto-generated-cl: translation import
2015-07-29 15:31:28 -07:00
Jorim Jaggi
1b730cb77e
am 434d55e5
: am 23ace013
: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '434d55e591bfb7cc84fed8d8574624425348a711':
Adjustments for find sensor screen
2015-07-29 22:26:16 +00:00
Jorim Jaggi
434d55e591
am 23ace013
: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '23ace01340906e9615f747b0adeaac4bf7bf1dc2':
Adjustments for find sensor screen
2015-07-29 22:14:09 +00:00
Billy Lau
fee785645b
Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's
...
page instead of the top level one
Settings:
Added two activities to handle app-specific Intent when app invoke permission
management UI.
SettingsActivity:
Added two fragment classes to handle app-specific Intent when app invoke permission
management UI.
AndroidManifest.xml:
We handle both Intent to top level settings and app-specific management UI for
app ops protected permissions.
AppStateAppOpsBridge:
Added a new field to PermissionState to keep track of permission declared vs one
that is actually granted during install time.
AppState{Overlay/Usage/WriteSettings}Bridge:
Updated the fields affected by changes in PermissionState.
{DrawOverlay/UsageAccess/WriteSettings}Details:
Disabled the toggling of permission if the app did not declare for the asked
permission.
Change-Id: Ibf63e4d9a4fbf7899a93d2176abb1204c4f75557
2015-07-29 23:04:57 +01:00
Fyodor Kupolov
eac01dc739
am cae9e899
: am 2731a18f
: Merge "brightness status not refresh in powercontrol widget"
...
* commit 'cae9e8999c27e21518db84ac94860f5958046c69':
brightness status not refresh in powercontrol widget
2015-07-29 22:04:16 +00:00
Maurice Lam
e863016bac
am e27b5590
: am 4921339a
: am 0ce45dbb
: am 1df9a7cc
: am 3760e5e7
: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit 'e27b5590986c378ae225d91ec258a85f4428f00b':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 22:03:37 +00:00
Julia Reynolds
7b37a563ce
am 89594f52
: am 61bc6b72
: am 24a1ac36
: am c2f62f65
: am 00b5488c
: Merge "Change assist app warning message text" into mnc-dev
...
* commit '89594f520ad0b59dd58ea67cd788d6ee63485fdb':
Change assist app warning message text
2015-07-29 22:02:33 +00:00
Julia Reynolds
878aca754b
am 7ae0f3cd
: am a578d3af
: am 6785be73
: am 089e9e9a
: am ae422fd0
: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit '7ae0f3cdf21811712527461d623c5699b96cf8a2':
Change 'data' label to 'data usage'.
2015-07-29 22:02:31 +00:00
Jorim Jaggi
23ace01340
Merge "Adjustments for find sensor screen" into mnc-dev
2015-07-29 21:58:43 +00:00
Sanket Padawe
86d853000f
am 19336da3
: am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '19336da3f729fcde00782ae60124b1219bd4bf2b':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 20:03:32 +00:00
Fyodor Kupolov
cae9e8999c
am 2731a18f
: Merge "brightness status not refresh in powercontrol widget"
...
* commit '2731a18fbe26eed89d870bf70a116a3588d227e1':
brightness status not refresh in powercontrol widget
2015-07-29 20:02:25 +00:00
Sanket Padawe
19336da3f7
am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'ac2347c0bf3c2b9c2ff7d8e2abe0a38d861495c4':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:49:53 +00:00
Maurice Lam
e27b559098
am 4921339a
: am 0ce45dbb
: am 1df9a7cc
: am 3760e5e7
: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit '4921339acc0a670ba9fdefe612667db9f8d50bc6':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 19:35:53 +00:00
Fyodor Kupolov
2731a18fbe
Merge "brightness status not refresh in powercontrol widget"
2015-07-29 19:27:15 +00:00
Sanket Padawe
ac2347c0bf
am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:25:06 +00:00
Maurice Lam
4921339acc
am 0ce45dbb
: am 1df9a7cc
: am 3760e5e7
: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit '0ce45dbbe74c45f89098cde7239c257e3cf87d5d':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 19:13:30 +00:00
Maurice Lam
0ce45dbbe7
am 1df9a7cc
: am 3760e5e7
: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit '1df9a7cc16a9dd9892b633aad4ec246677d2c6b5':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 18:53:41 +00:00
Julia Reynolds
89594f520a
am 61bc6b72
: am 24a1ac36
: am c2f62f65
: am 00b5488c
: Merge "Change assist app warning message text" into mnc-dev
...
* commit '61bc6b729b61359c89ed695910fb1774eab9e88a':
Change assist app warning message text
2015-07-29 18:52:51 +00:00
Julia Reynolds
7ae0f3cdf2
am a578d3af
: am 6785be73
: am 089e9e9a
: am ae422fd0
: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit 'a578d3afe839247c24ee805852d7fdf12250607c':
Change 'data' label to 'data usage'.
2015-07-29 18:52:49 +00:00
Maurice Lam
1df9a7cc16
am 3760e5e7
: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit '3760e5e7e4ae17012cf0f336fa0d8d62ecbf5e69':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 18:39:00 +00:00
Julia Reynolds
61bc6b729b
am 24a1ac36
: am c2f62f65
: am 00b5488c
: Merge "Change assist app warning message text" into mnc-dev
...
* commit '24a1ac3620f8fd983f42d38d24a32b13f74b8cda':
Change assist app warning message text
2015-07-29 18:30:46 +00:00
Julia Reynolds
a578d3afe8
am 6785be73
: am 089e9e9a
: am ae422fd0
: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit '6785be7362a158926e36f0bfe3f721082c9be3f3':
Change 'data' label to 'data usage'.
2015-07-29 18:30:45 +00:00
Maurice Lam
3760e5e7e4
Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
2015-07-29 18:25:48 +00:00
Julia Reynolds
24a1ac3620
am c2f62f65
: am 00b5488c
: Merge "Change assist app warning message text" into mnc-dev
...
* commit 'c2f62f650a16aead5f6806ca2ac7ae400775c935':
Change assist app warning message text
2015-07-29 18:03:57 +00:00
Julia Reynolds
6785be7362
am 089e9e9a
: am ae422fd0
: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit '089e9e9a0dc4ad2c87e0ca79c16b6375b9623554':
Change 'data' label to 'data usage'.
2015-07-29 18:03:56 +00:00
Julia Reynolds
c2f62f650a
am 00b5488c
: Merge "Change assist app warning message text" into mnc-dev
...
* commit '00b5488c67d3e7d1fd2905a24a6382f81026e5e7':
Change assist app warning message text
2015-07-29 17:41:15 +00:00
Julia Reynolds
089e9e9a0d
am ae422fd0
: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit 'ae422fd0991e5dd8fab6816153ed0f4b6653beb0':
Change 'data' label to 'data usage'.
2015-07-29 17:41:14 +00:00
Chris Wren
aa352b39ca
am 96117fc7
: am 97ad12db
: am 59f07cc7
: am cb176a41
: am 2a56d7f2
: Merge "fix InactiveApps instrumentation" into mnc-dev
...
* commit '96117fc751d45f8ab307512821c9a19ee48249f6':
fix InactiveApps instrumentation
2015-07-29 17:31:01 +00:00
Julia Reynolds
00b5488c67
Merge "Change assist app warning message text" into mnc-dev
2015-07-29 17:26:12 +00:00
Julia Reynolds
ae422fd099
Merge "Change 'data' label to 'data usage'." into mnc-dev
2015-07-29 17:25:41 +00:00
Julia Reynolds
ff0e1650d9
Change 'data' label to 'data usage'.
...
Bug: 22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c
2015-07-29 13:15:14 -04:00
Chris Wren
96117fc751
am 97ad12db
: am 59f07cc7
: am cb176a41
: am 2a56d7f2
: Merge "fix InactiveApps instrumentation" into mnc-dev
...
* commit '97ad12db5c36792870888b5d4a0f0c8d35bf059b':
fix InactiveApps instrumentation
2015-07-29 17:08:51 +00:00
Sanket Padawe
158fa95218
am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 17:08:45 +00:00
Julia Reynolds
5bdf80c868
Change assist app warning message text
...
Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555
2015-07-29 13:02:09 -04:00
Chris Wren
97ad12db5c
am 59f07cc7
: am cb176a41
: am 2a56d7f2
: Merge "fix InactiveApps instrumentation" into mnc-dev
...
* commit '59f07cc7c80b144c3ee618955fa6d8121347a6a7':
fix InactiveApps instrumentation
2015-07-29 16:49:46 +00:00
Sanket Padawe
df9b13af9b
am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 16:44:58 +00:00
Chris Wren
59f07cc7c8
am cb176a41
: am 2a56d7f2
: Merge "fix InactiveApps instrumentation" into mnc-dev
...
* commit 'cb176a41ad0ac94a65ed13bf1e18242f8220bd5b':
fix InactiveApps instrumentation
2015-07-29 16:26:32 +00:00
Sanket Padawe
74d8594950
am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'e05f71431548cba1b14807ba7f07a5df89c3f0a4':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 16:15:17 +00:00
Chris Wren
cb176a41ad
am 2a56d7f2
: Merge "fix InactiveApps instrumentation" into mnc-dev
...
* commit '2a56d7f23b4ef87ffb44ab6fcc4fbae6283a3242':
fix InactiveApps instrumentation
2015-07-29 16:11:21 +00:00
Geoff Mendal
7e71e5b708
am ba648051
: (-s ours) am 6e639eec
: (-s ours) am f13f08be
: (-s ours) am fe6fc96a
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'ba648051abb05b17a9739532da894441e3e27caf':
Import translations. DO NOT MERGE
2015-07-29 15:16:00 +00:00
Geoff Mendal
ba648051ab
am 6e639eec
: (-s ours) am f13f08be
: (-s ours) am fe6fc96a
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '6e639eec1211977e521189b1a00be28f4c1def2a':
Import translations. DO NOT MERGE
2015-07-29 14:59:11 +00:00
Martijn Coenen
0bfb940964
am 7d49ed8a
: am 034b6801
: am d93b6412
: am 3c975a9f
: am edb2668c
: Merge "Add contactless symbol to NFC resources." into mnc-dev
...
* commit '7d49ed8ac25426dcdeb7a022bab421ba3152d430':
Add contactless symbol to NFC resources.
2015-07-29 14:57:59 +00:00
Chris Wren
2a56d7f23b
Merge "fix InactiveApps instrumentation" into mnc-dev
2015-07-29 14:57:14 +00:00
Martijn Coenen
7d49ed8ac2
am 034b6801
: am d93b6412
: am 3c975a9f
: am edb2668c
: Merge "Add contactless symbol to NFC resources." into mnc-dev
...
* commit '034b6801f4a42522c2493d3f3df2c7596c183de6':
Add contactless symbol to NFC resources.
2015-07-29 14:36:49 +00:00
Geoff Mendal
6e639eec12
am f13f08be
: (-s ours) am fe6fc96a
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'f13f08be291ff5cfe52b6fc99112e533698af41a':
Import translations. DO NOT MERGE
2015-07-29 14:36:40 +00:00
Martijn Coenen
034b6801f4
am d93b6412
: am 3c975a9f
: am edb2668c
: Merge "Add contactless symbol to NFC resources." into mnc-dev
...
* commit 'd93b6412801706311b9389f789ecdf76969695db':
Add contactless symbol to NFC resources.
2015-07-29 14:16:35 +00:00
Geoff Mendal
f13f08be29
am fe6fc96a
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'fe6fc96a59903f77663ae5435183055be9cc5b74':
Import translations. DO NOT MERGE
2015-07-29 14:15:18 +00:00