Geoff Mendal
c9541e5fda
Import translations. DO NOT MERGE
...
Change-Id: Iee81fc4d17f748e4a9fd294c6d813a773dc44b89
Auto-generated-cl: translation import
2015-07-20 15:26:26 -07:00
Christopher Tate
d2dcd30acd
am 99e89859: am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit '99e8985959682c510e7e2fac210768e2471b4b26':
Offer 'ask' as an available app-linking state
2015-07-20 18:38:23 +00:00
Christopher Tate
99e8985959
am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit 'ef1961c7326aa60e1e3bbb738394c535b7f952af':
Offer 'ask' as an available app-linking state
2015-07-20 18:17:05 +00:00
Christopher Tate
ef1961c732
am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit '7cce6d0c529bf9d3820b1fc4d8b5ad364a74a478':
Offer 'ask' as an available app-linking state
2015-07-20 17:59:35 +00:00
Christopher Tate
7cce6d0c52
am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit 'f330857a17d29cec33ca0169cb30fdc69854ab52':
Offer 'ask' as an available app-linking state
2015-07-20 17:41:08 +00:00
Christopher Tate
f330857a17
am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit 'b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63':
Offer 'ask' as an available app-linking state
2015-07-20 17:24:02 +00:00
Christopher Tate
b852fcbde9
Merge "Offer 'ask' as an available app-linking state" into mnc-dev
2015-07-20 17:06:27 +00:00
Geoff Mendal
e8d4a48a5b
am 387bc745: (-s ours) am 644a7e9e: (-s ours) am e9c77337: (-s ours) am 9c314f05: (-s ours) Import translations. DO NOT MERGE
...
* commit '387bc74546d6b6be10c531c14b39f28833918582':
Import translations. DO NOT MERGE
2015-07-20 15:20:53 +00:00
Geoff Mendal
387bc74546
am 644a7e9e: (-s ours) am e9c77337: (-s ours) am 9c314f05: (-s ours) Import translations. DO NOT MERGE
...
* commit '644a7e9e1b9f91583074fa54aade99903ff17cec':
Import translations. DO NOT MERGE
2015-07-20 15:11:36 +00:00
Geoff Mendal
644a7e9e1b
am e9c77337: (-s ours) am 9c314f05: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e9c773371d45640868978cc7722295c228b9089e':
Import translations. DO NOT MERGE
2015-07-20 15:00:21 +00:00
Geoff Mendal
e9c773371d
am 9c314f05: (-s ours) Import translations. DO NOT MERGE
...
* commit '9c314f05f85ffe6918bcd9d0747903dc6786dfc0':
Import translations. DO NOT MERGE
2015-07-20 14:45:23 +00:00
Geoff Mendal
9c314f05f8
Import translations. DO NOT MERGE
...
Change-Id: Ibd37f1c6a32c600eaf7b410891ba81814589ea04
Auto-generated-cl: translation import
2015-07-20 07:01:44 -07:00
Geoff Mendal
ca354d3f5f
Import translations. DO NOT MERGE
...
Change-Id: I26e34043644e1fcf86201a20019bba85f500e3fe
Auto-generated-cl: translation import
2015-07-20 06:14:39 -07:00
Christopher Tate
2eda36509f
Offer 'ask' as an available app-linking state
...
Bug 22532193
Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
2015-07-17 16:11:41 -07:00
Jim Miller
dfa1e04678
am 03bb45e1: am af5de85b: am 64117fef: am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
...
* commit '03bb45e1103ede787c6a465cd838e46b3818f397':
Simplify FingerprintSettings
2015-07-17 22:04:19 +00:00
Jim Miller
03bb45e110
am af5de85b: am 64117fef: am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
...
* commit 'af5de85bc0797449005c028e21a8af7a3c460901':
Simplify FingerprintSettings
2015-07-17 21:49:34 +00:00
Jim Miller
af5de85bc0
am 64117fef: am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
...
* commit '64117fef33b0e73690a6cddf38992ea5b82d10db':
Simplify FingerprintSettings
2015-07-17 21:42:07 +00:00
Xiaohui Chen
40e2437d77
Merge "sys user split: update createUser method"
2015-07-17 21:33:11 +00:00
Jim Miller
64117fef33
am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
...
* commit '4b3bc882ad2824a1f7d4362d8757ddb9c7ba21ce':
Simplify FingerprintSettings
2015-07-17 21:30:11 +00:00
Julia Reynolds
7c5f0e18cc
am 406b1b9f: am 98f81284: am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '406b1b9f204e769181901a2c157b026971e902fb':
Remove blank switchtext from switch preferences.
2015-07-17 21:21:48 +00:00
Jim Miller
4b3bc882ad
am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
...
* commit 'bf9a425d5c3f61f02133084d11ab8481b0f53102':
Simplify FingerprintSettings
2015-07-17 21:15:57 +00:00
Julia Reynolds
406b1b9f20
am 98f81284: am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '98f8128486d44defdd6cbda3346baceb6dc1c5f1':
Remove blank switchtext from switch preferences.
2015-07-17 21:07:35 +00:00
Jim Miller
bf9a425d5c
Merge "Simplify FingerprintSettings" into mnc-dev
2015-07-17 21:05:07 +00:00
Jim Miller
8e83475024
Simplify FingerprintSettings
...
There's no need for FingerprintSettings to retry fingerprint
any more often than these cases: 1. authentication success,
2. authentication error and 3. when the activity resumes.
Fixes bug 22438498
Change-Id: I87841e9916cfc9e6c64cd1df009b9a9c765f87d0
2015-07-17 21:03:42 +00:00
Julia Reynolds
98f8128486
am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '03b1b4f33f9101d95f0e881ffebec24a99498eb0':
Remove blank switchtext from switch preferences.
2015-07-17 20:53:54 +00:00
Julia Reynolds
03b1b4f33f
am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '8560ae2f8752f611ffee651289519a7993b3e500':
Remove blank switchtext from switch preferences.
2015-07-17 20:40:19 +00:00
Julia Reynolds
8560ae2f87
am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '0c03b50a02007499208603733e597f72aa9a59c2':
Remove blank switchtext from switch preferences.
2015-07-17 20:27:24 +00:00
Julia Reynolds
0c03b50a02
Merge "Remove blank switchtext from switch preferences." into mnc-dev
2015-07-17 20:11:27 +00:00
Billy Lau
6897d6978e
am 81e050aa: am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
...
* commit '81e050aad01c15484fe4e262c53475bd13c4782b':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 19:52:38 +00:00
Billy Lau
81e050aad0
am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
...
* commit '28f352483e2951339627be1867562cd4ca99f66e':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 19:29:21 +00:00
Billy Lau
28f352483e
am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
...
* commit 'e5a95396da082a3ba432c5d8ed5a7baa2eacd55c':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 19:09:06 +00:00
Billy Lau
e5a95396da
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)...
2015-07-17 18:57:51 +00:00
Billy Lau
e104fced18
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)...
2015-07-17 18:39:23 +00:00
Billy Lau
90a8a01b62
Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
2015-07-17 18:28:28 +00:00
Billy Lau
f8f9802104
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
2015-07-17 18:23:57 +01:00
Christopher Tate
021c21816d
am 0111096e: am 5c3f34b7: am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
...
* commit '0111096eca186f771ed1cd65d10b9509d6b5ddec':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-17 00:40:50 +00:00
Christopher Tate
0111096eca
am 5c3f34b7: am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
...
* commit '5c3f34b7e5ce05d134e7ec907758641a8bdf1932':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-17 00:27:45 +00:00
Christopher Tate
5c3f34b7e5
am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
...
* commit 'b42eb5e221b9120741f497cc94486dc804ab2cbb':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-17 00:17:06 +00:00
Christopher Tate
b42eb5e221
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
2015-07-17 00:04:04 +00:00
Christopher Tate
649cc87f99
am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
...
* commit 'ddaa142a094a404d7c5e6d7eea93920f8ed16696':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-16 23:50:06 +00:00
Christopher Tate
ddaa142a09
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
...
Bug 22504009
Change-Id: I19ded70cf17936504a2a1becea2684d87952dff6
2015-07-16 16:07:12 -07:00
Xiaohui Chen
8ae4680977
sys user split: update createUser method
...
After the system user is split out, all users are more or less the same.
We combine the generic user and secondary user create method to reflect
this concept. This also fixes the bug the newly created Primary user
from lock screen contains secondary user restrictions.
Bug: 19913735
Change-Id: I407a877c11346409bad85e00038f6cfd3d126da3
2015-07-16 14:34:00 -07:00
Xiaohui Chen
33b17beb9d
Merge "sys user split: fix user settings user list"
2015-07-16 17:46:08 +00:00
Julia Reynolds
16eec50576
Remove blank switchtext from switch preferences.
...
This makes TTS services read the default text (on/off) when
these switches are toggled.
Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
2015-07-16 13:28:16 -04:00
Kenny Guy
2a9b911a85
am 32b5ec83: am dbb975f8: am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit '32b5ec834adfd5a14eaca23ece62aecfab143baa':
Show disabled trust agents as off.
2015-07-16 17:17:34 +00:00
Xiaohui Chen
148ef7795d
sys user split: fix user settings user list
...
Only end user switchable users should show up in this list.
BUG:19913735
Change-Id: Ifb83f159864f2210d779b5831c5a5c4dc5e6f4bb
2015-07-16 10:09:37 -07:00
Xiaohui Chen
c49c26bf04
Merge "sys user split: refactor user settings"
2015-07-16 16:16:20 +00:00
Kenny Guy
32b5ec834a
am dbb975f8: am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit 'dbb975f8a0dc77bbfa9578a3a394de9cbe08d7cd':
Show disabled trust agents as off.
2015-07-16 13:42:00 +00:00
Kenny Guy
dbb975f8a0
am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit '00a82a4e1b125a25ec3c92e90dbc3de986124813':
Show disabled trust agents as off.
2015-07-16 13:30:00 +00:00
Kenny Guy
00a82a4e1b
am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit '29d1b0d0f4e7760ee1ed317b303a6c4ec54adda7':
Show disabled trust agents as off.
2015-07-16 13:15:57 +00:00
