Julia Reynolds
|
945f6e211c
|
am d16f564d: am 0a52b7b3: (-s ours) am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
* commit 'd16f564d0b2b621e107ac896f041dbf23c149126':
|
2015-08-27 20:19:33 +00:00 |
|
Julia Reynolds
|
cbf42e6364
|
am 468bf839: am 72bb3a69: (-s ours) am f889faaf: Merge "Bump string char limit." into mnc-dev
* commit '468bf8393ba8ccb007c7a144afcce7f8c157eade':
|
2015-08-27 20:19:31 +00:00 |
|
Martijn Coenen
|
82a158ac41
|
am 67d37ec8: am 274d9246: (-s ours) am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit '67d37ec89307d959894f0e1065a8334cf72b9f0a':
|
2015-08-27 20:19:29 +00:00 |
|
Zach Johnson
|
145338a28f
|
am 965dd0f3: am 4fd8d1e1: (-s ours) am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit '965dd0f3b4df454a4356a6a84d7c5a0f5179f556':
|
2015-08-27 20:19:26 +00:00 |
|
Julia Reynolds
|
bcacf33d88
|
am aa139449: am 1ae73faf: (-s ours) am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit 'aa13944984e77d4ccab8f21e48512ad3de32cb48':
|
2015-08-27 20:19:24 +00:00 |
|
Julia Reynolds
|
201c4f6d83
|
am 3ae4f044: am b5063920: (-s ours) am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit '3ae4f044889f2b773ac96010791a0cd79b926702':
|
2015-08-27 20:19:23 +00:00 |
|
Jorim Jaggi
|
ede31bb1b0
|
am 0a3fa3d9: am 9fd7d6fd: (-s ours) am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit '0a3fa3d9a37ed309789f7efb88b52dca08e87ec6':
|
2015-08-27 20:19:20 +00:00 |
|
Jorim Jaggi
|
d87f374944
|
am 111e82df: am 4088cef8: (-s ours) am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit '111e82dfce39f1a6fc9cdd18e27bcb4e219341b6':
|
2015-08-27 20:19:18 +00:00 |
|
Jorim Jaggi
|
258b6b68d1
|
am 4fdd5cc6: am a77130f7: (-s ours) am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit '4fdd5cc6e0814a2ee06ce28bf9f1d1c613d142be':
|
2015-08-27 20:19:16 +00:00 |
|
Jorim Jaggi
|
e69c3a4d11
|
am 3ae8ae37: am 69941efa: (-s ours) am 730389bd: Merge "Adjust choose assist app string" into mnc-dev
* commit '3ae8ae371f0361927753153540aa0b3232cafb18':
|
2015-08-27 20:19:14 +00:00 |
|
Jorim Jaggi
|
daf678ae3e
|
am 2531fe7c: am e4e8bb34: (-s ours) am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit '2531fe7c4501a5c44534850e2670dfe1e77cb3f3':
|
2015-08-27 20:19:12 +00:00 |
|
Selim Cinek
|
451c7f11a1
|
am da7bbe68: am d2b6e1ac: (-s ours) am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
* commit 'da7bbe68101413a44f0cf985b22e92ab280b2d26':
|
2015-08-27 20:19:09 +00:00 |
|
Selim Cinek
|
e33a8db52c
|
am 5aae3cae: am 412eb5df: (-s ours) am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
* commit '5aae3caea2b0bac5e6e03f8b5fe38914d1b05ec2':
|
2015-08-27 20:19:07 +00:00 |
|
Selim Cinek
|
532219d2fd
|
am 73de309d: am e0f552c1: (-s ours) am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
* commit '73de309dc9d737cb6461b4980cabacbec3b02c2c':
|
2015-08-27 20:19:05 +00:00 |
|
Jorim Jaggi
|
29de51d236
|
am ff53e141: am 607e7963: (-s ours) am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit 'ff53e1415a45c36f2328daa2c089691098acbb82':
|
2015-08-27 20:19:02 +00:00 |
|
Jason Monk
|
c397c877bd
|
am 5c87cdd8: am 9a5dc80d: (-s ours) am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '5c87cdd8a7970500921b263103867a46cd7ccff9':
|
2015-08-27 20:19:00 +00:00 |
|
Jason Monk
|
55f105fec3
|
am c3c9dbd3: am 9d5907d0: (-s ours) am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit 'c3c9dbd31eb421096913f8794e95e8d039d6dc5e':
|
2015-08-27 20:18:57 +00:00 |
|
Sanket Padawe
|
26aeddcffb
|
am 759e3fab: am 9cbb3549: (-s ours) am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
* commit '759e3fab0b8ec479845a217aede3b683ef785f97':
|
2015-08-27 20:18:55 +00:00 |
|
Julia Reynolds
|
201b9403b2
|
am ff5823f5: am 0b674961: (-s ours) am 9a1c0dce: Handle app uninstall via Storage & USB.
* commit 'ff5823f58ae938155bdb7338bbbddc6ef0419bed':
|
2015-08-27 20:18:52 +00:00 |
|
Geoff Mendal
|
588b3f1541
|
am b1c078f4: (-s ours) am a8b7c118: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit 'b1c078f479a8c97eff6dde9306742cb4b76b959d':
|
2015-08-27 20:18:46 +00:00 |
|
Adrian Roos
|
6b189b90b0
|
am c667011f: am d6dc0bb4: (-s ours) am 38c9b9eb: Update FRP warning to spec
* commit 'c667011fad3eb0ff62e495ced2d861679c1a8c80':
|
2015-08-27 20:18:41 +00:00 |
|
Maurice Lam
|
6d1affd9d3
|
am d04a354f: am 27165dc3: (-s ours) am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit 'd04a354f3ee98fd133b96fd083846a5ab5f9419f':
|
2015-08-27 20:18:38 +00:00 |
|
Geoff Mendal
|
c1ef998716
|
am 1bc1ba75: (-s ours) am 61c436d7: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '1bc1ba7591664f2ab42c149fd2534b0be392fc7b':
|
2015-08-27 20:18:35 +00:00 |
|
Svetoslav Ganov
|
01d371bde4
|
am a431dacb: am 6356ee4b: (-s ours) am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit 'a431dacb60edf4fa77b348a3145c091bc236ec91':
|
2015-08-27 20:18:32 +00:00 |
|
Jason Monk
|
94342dbbd7
|
am 3e63b62e: am 06621a57: (-s ours) am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '3e63b62e802d0d40e24ac24de62c92d5fb7ef5a8':
|
2015-08-27 20:18:29 +00:00 |
|
Jason Monk
|
6cba24941c
|
am 4e3a98cc: am 5b3921e4: (-s ours) am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '4e3a98ccf11f666aeb8e49ef7adb20d54ed5e18e':
|
2015-08-27 20:18:22 +00:00 |
|
Guang Zhu
|
5e9a946447
|
am 65fc6ae9: am 8a4dda67: (-s ours) am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '65fc6ae97be6cd560353e397e271d722a1c4d85d':
|
2015-08-27 20:18:17 +00:00 |
|
Pavel Zhamaitsiak
|
38deb84ea4
|
am f07fb805: am 8a222530: (-s ours) am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit 'f07fb8054457aa7a3d410e63fb8435044a7aa757':
|
2015-08-27 20:18:14 +00:00 |
|
Jason Monk
|
6dabdb217b
|
am 03dcebb6: am e2840f1c: (-s ours) am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '03dcebb641083d8e02d0019acee9bebd0678a2ea':
|
2015-08-27 20:18:11 +00:00 |
|
Maurice Lam
|
e7e43ec8e7
|
am 00c4204d: am 2f2779ac: (-s ours) am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '00c4204d1d7d7982c93041b14abe407540d9c699':
|
2015-08-27 20:18:09 +00:00 |
|
Maurice Lam
|
eea9cf174b
|
am 96235b33: am 9dd92338: (-s ours) am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '96235b3345c47b853108dca5a1f7841ee0060d57':
|
2015-08-27 20:18:06 +00:00 |
|
Maurice Lam
|
dc661005de
|
am 3d09fef6: am 899d0a28: (-s ours) am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '3d09fef6f3484d90803af5ad60b586a9d13dccf0':
|
2015-08-27 20:18:04 +00:00 |
|
Billy Lau
|
8ac1851211
|
am bc23f8e8: am 3d861fd1: (-s ours) am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit 'bc23f8e87fc8b698cfdd20ef17fafa17f674e4a8':
|
2015-08-27 20:18:01 +00:00 |
|
Amit Mahajan
|
3deead6ec7
|
am eb22a7e5: am c1d2289b: (-s ours) am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'eb22a7e5e801c697836136c6ba1b8568a2afa8aa':
|
2015-08-27 20:17:59 +00:00 |
|
Julia Reynolds
|
1c429294f1
|
am 6f90c1e5: am cb271219: (-s ours) am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '6f90c1e52c5b996566391ee387fc582b9c115f9b':
|
2015-08-27 20:17:56 +00:00 |
|
Maurice Lam
|
1e21579d49
|
am be127765: am c97e5aba: (-s ours) am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'be1277653320931d3c30f266a805e0b7bad8d53a':
|
2015-08-27 20:17:53 +00:00 |
|
Maurice Lam
|
15662c0c41
|
am 63cccf0e: am a33b68af: (-s ours) am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '63cccf0ee900cef3c8046cbc1002e29977d370d8':
|
2015-08-27 20:17:50 +00:00 |
|
Maurice Lam
|
fc7c549da3
|
am 34b0d29c: am ac4b7fac: (-s ours) am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '34b0d29c728d966a51fa173d1e16ccda5465f44b':
|
2015-08-27 20:17:48 +00:00 |
|
Jim Miller
|
f9088fe8f5
|
am ad967163: am d55152af: (-s ours) am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit 'ad9671633a5e23a85405056786967130cb4942e6':
|
2015-08-27 20:17:44 +00:00 |
|
Geoff Mendal
|
e655c0b942
|
am 817e6042: (-s ours) am bc8c7914: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '817e60422ae3c1fe9f2ba4cea0252d2975711ba5':
|
2015-08-27 20:17:41 +00:00 |
|
Makoto Onuki
|
72741d4371
|
am eeb54564: am 9e95d6ce: (-s ours) am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit 'eeb54564015b6bfe20adb06e04b5b8382fd10cc5':
|
2015-08-27 20:17:38 +00:00 |
|
Jason Monk
|
771bcdeaf5
|
am fab32abd: am cb4b45cc: (-s ours) am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit 'fab32abd36833c30c3af4277c49340b9d728f725':
|
2015-08-27 20:17:35 +00:00 |
|
Christopher Tate
|
f9aefc63ac
|
am 6e9ace6a: am 55073e09: (-s ours) am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '6e9ace6a5aa0d03dd1629a1069a3e14a2ddef7bc':
|
2015-08-27 20:17:33 +00:00 |
|
Jim Miller
|
837623cdc1
|
am 2c8ee8e6: am 7120c7b6: (-s ours) am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit '2c8ee8e6e68fca38188379126cbb40c1aa8d5185':
|
2015-08-27 20:17:30 +00:00 |
|
Julia Reynolds
|
381947706e
|
am 18611616: am 75b901c3: (-s ours) am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '186116163ee8b6ed2197cfd0f6e734957da89046':
|
2015-08-27 20:17:28 +00:00 |
|
Billy Lau
|
6fdec7a4ff
|
am e058a53f: am 262b64e7: (-s ours) am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit 'e058a53fd2367f080b52fe56c80af3267ce4781b':
|
2015-08-27 20:17:25 +00:00 |
|
Christopher Tate
|
aebf5096cd
|
am 0cc7388b: am feb343ad: (-s ours) am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '0cc7388b20bd31fb4f63479c1d505807adf42833':
|
2015-08-27 20:17:22 +00:00 |
|
Kenny Guy
|
5efd226ac9
|
am c8f366e8: am e200c475: (-s ours) am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit 'c8f366e843dba00465f2863fa3de42a986d65704':
|
2015-08-27 20:17:19 +00:00 |
|
Sanket Padawe
|
44a0350884
|
am 0d3accb7: am bee718b7: (-s ours) am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '0d3accb711bbfd8c31f9bbc228b0b3441fbd39ff':
|
2015-08-27 20:17:17 +00:00 |
|
Maurice Lam
|
4c89fdfd42
|
am 9541f8c3: am d4fa7aa4: (-s ours) am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '9541f8c35e01360d29be2e7095e03d60ae116b92':
|
2015-08-27 20:17:14 +00:00 |
|