Commit Graph

23170 Commits

Author SHA1 Message Date
Jeff Sharkey
d4dc3e3b1e am 43c41edf: (-s ours) am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit '43c41edfc76b7135d507d3b11d58ed214ff89ba9':
2015-08-27 11:34:45 +00:00
Billy Lau
aaa1621b6b am 62d04c00: (-s ours) am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev
* commit '62d04c0012d15d30c3e28364ac83ce5329aba8d1':
2015-08-27 11:34:43 +00:00
Jason Monk
6e27d59553 am 2ff120a3: (-s ours) am 19128bd1: Extend char limit by small amount
* commit '2ff120a33f25f5e64de72aeefe92663b233de335':
2015-08-27 11:34:40 +00:00
Geoff Mendal
c60a59235d am 149ceebc: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE
* commit '149ceebcedcdc986d89c3d983faf1c1a648406b8':
2015-08-27 11:34:38 +00:00
Geoff Mendal
4475b7712f am e6f7a8bf: (-s ours) am 53f771d8: (-s ours) Import translations. DO NOT MERGE
* commit 'e6f7a8bff7fbeebdf40e46e4a210467bfe085fc2':
2015-08-27 11:34:36 +00:00
Jorim Jaggi
8f21284807 am 7b48a1c6: (-s ours) am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
* commit '7b48a1c6f44e64136f705943ff8b046766e0ed2e':
2015-08-27 11:34:34 +00:00
Fyodor Kupolov
c4f1eaaf03 am 2c5f5921: (-s ours) am 2731a18f: Merge "brightness status not refresh in powercontrol widget"
* commit '2c5f59211f632bd3e2ce9cfe64101ea4e1f1a1a3':
2015-08-27 11:34:33 +00:00
Maurice Lam
aa69ebb566 am 862343bc: (-s ours) am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
* commit '862343bcadc6a19ea0f1e18506eb8a64f32872d8':
2015-08-27 11:34:31 +00:00
Julia Reynolds
1d85676b57 am 4254518a: (-s ours) am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit '4254518a759003c2e3c6fd60569ce68fe2c96424':
2015-08-27 11:34:29 +00:00
Julia Reynolds
1281463f6d am 06e59246: (-s ours) am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit '06e5924632eb7a9698790664ed2b4f865e832061':
2015-08-27 11:34:28 +00:00
Chris Wren
54aedb67fd am 3605c435: (-s ours) am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
* commit '3605c4356a339626593ae52813b2574a5a355370':
2015-08-27 11:34:27 +00:00
Martijn Coenen
68da3bcbd5 am 3e7d3faf: (-s ours) am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
* commit '3e7d3faf20c321d87509c04a74fa05f048309f4d':
2015-08-27 11:34:25 +00:00
Julia Reynolds
d16f564d0b am 0a52b7b3: (-s ours) am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
* commit '0a52b7b3c4d520d0cf4c970ebe1f2f40e89bc773':
2015-08-27 11:34:24 +00:00
Julia Reynolds
468bf8393b am 72bb3a69: (-s ours) am f889faaf: Merge "Bump string char limit." into mnc-dev
* commit '72bb3a69248b4ffbaa3ac597eb557bc1f7a4db03':
2015-08-27 11:34:23 +00:00
Martijn Coenen
67d37ec893 am 274d9246: (-s ours) am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit '274d92467a92a5c88b1d28a5aedb310dc2a3d714':
2015-08-27 11:34:21 +00:00
Zach Johnson
965dd0f3b4 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 '4fd8d1e1474948cbcd284098d1fd68d2b5ec1b8f':
2015-08-27 11:34:20 +00:00
Julia Reynolds
aa13944984 am 1ae73faf: (-s ours) am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit '1ae73fafe74782ca7bb34c40141cf231adff5e67':
2015-08-27 11:34:19 +00:00
Julia Reynolds
3ae4f04488 am b5063920: (-s ours) am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit 'b506392025219402d5010e7786134321230ce519':
2015-08-27 11:34:17 +00:00
Jorim Jaggi
0a3fa3d9a3 am 9fd7d6fd: (-s ours) am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit '9fd7d6fd63829d96de143250a7092b7b49d526fc':
2015-08-27 11:34:16 +00:00
Jorim Jaggi
111e82dfce am 4088cef8: (-s ours) am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit '4088cef80f62b5381df3b54b4379fa46c3c390d9':
2015-08-27 11:34:15 +00:00
Jorim Jaggi
4fdd5cc6e0 am a77130f7: (-s ours) am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit 'a77130f7e40bb5cb16b2379d0739f85402906d18':
2015-08-27 11:34:13 +00:00
Jorim Jaggi
3ae8ae371f am 69941efa: (-s ours) am 730389bd: Merge "Adjust choose assist app string" into mnc-dev
* commit '69941efa8bf2a41c03293aa6986fbe6d873baa2d':
2015-08-27 11:34:12 +00:00
Jorim Jaggi
2531fe7c45 am e4e8bb34: (-s ours) am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit 'e4e8bb3486bd3642baa88a06c529cb428c27005f':
2015-08-27 11:34:11 +00:00
Selim Cinek
da7bbe6810 am d2b6e1ac: (-s ours) am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
* commit 'd2b6e1acd0ca0ebd3cfc64295dc19ef2cf1c4455':
2015-08-27 11:34:10 +00:00
Selim Cinek
5aae3caea2 am 412eb5df: (-s ours) am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
* commit '412eb5dfdea71902ac64a1392cf9d791b0a5f647':
2015-08-27 11:34:08 +00:00
Selim Cinek
73de309dc9 am e0f552c1: (-s ours) am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
* commit 'e0f552c140c98ad20d97dd139606a4fbf8451982':
2015-08-27 11:34:07 +00:00
Jorim Jaggi
ff53e1415a am 607e7963: (-s ours) am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit '607e796331ce7c32b989d02efb9e303fc2c71bef':
2015-08-27 11:34:06 +00:00
Jason Monk
5c87cdd8a7 am 9a5dc80d: (-s ours) am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '9a5dc80d050fb63fa5f2c8b5877b4b9ecc3123a8':
2015-08-27 11:34:04 +00:00
Jason Monk
c3c9dbd31e am 9d5907d0: (-s ours) am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit '9d5907d03edfec6a2823f908cade6c458644da0b':
2015-08-27 11:34:03 +00:00
Sanket Padawe
759e3fab0b am 9cbb3549: (-s ours) am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
* commit '9cbb3549369b412525dc6485c6b6eba189208e76':
2015-08-27 11:34:02 +00:00
Julia Reynolds
ff5823f58a am 0b674961: (-s ours) am 9a1c0dce: Handle app uninstall via Storage & USB.
* commit '0b6749614c3ed78bebf43ab0d9574ace2087c3fd':
2015-08-27 11:34:00 +00:00
Geoff Mendal
b1c078f479 am a8b7c118: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit 'a8b7c118f5551797f3fba028ed78162eca346fa4':
2015-08-27 11:33:59 +00:00
Adrian Roos
c667011fad am d6dc0bb4: (-s ours) am 38c9b9eb: Update FRP warning to spec
* commit 'd6dc0bb46af5ceb0253577716e5a09ddc0145044':
2015-08-27 11:33:58 +00:00
Maurice Lam
d04a354f3e am 27165dc3: (-s ours) am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '27165dc3e86642b862b9333d82742be5924c72b3':
2015-08-27 11:33:57 +00:00
Geoff Mendal
1bc1ba7591 am 61c436d7: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '61c436d73c76603d4ccec302984a137ab251c83a':
2015-08-27 11:33:56 +00:00
Svetoslav Ganov
a431dacb60 am 6356ee4b: (-s ours) am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '6356ee4bcb7b1fc12337f4f08c6635ffe42668a4':
2015-08-27 11:33:54 +00:00
Jason Monk
3e63b62e80 am 06621a57: (-s ours) am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '06621a57fd7894ba4835a157616b8b93215da7a7':
2015-08-27 11:33:53 +00:00
Jason Monk
4e3a98ccf1 am 5b3921e4: (-s ours) am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '5b3921e44ac8e83d6c72f7704395467f7c6558bc':
2015-08-27 11:33:52 +00:00
Guang Zhu
65fc6ae97b am 8a4dda67: (-s ours) am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '8a4dda678668c211f512122fa2617fdafb8a2fcb':
2015-08-27 11:33:50 +00:00
Pavel Zhamaitsiak
f07fb80544 am 8a222530: (-s ours) am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit '8a222530bec3d55c4512fe941a87f653dba8ca23':
2015-08-27 11:33:49 +00:00
Jason Monk
03dcebb641 am e2840f1c: (-s ours) am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit 'e2840f1ce34b4d085fc9eb8bcd2fde7dca3587e0':
2015-08-27 11:33:48 +00:00
Maurice Lam
00c4204d1d am 2f2779ac: (-s ours) am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '2f2779acced14bfb2bf6ea4cecc74845a92ce384':
2015-08-27 11:33:46 +00:00
Maurice Lam
96235b3345 am 9dd92338: (-s ours) am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '9dd92338d05f3727e6b2b758ae319f20b08d5e7f':
2015-08-27 11:33:45 +00:00
Maurice Lam
3d09fef6f3 am 899d0a28: (-s ours) am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '899d0a28943ad7a797c6b8bf6bd1695cc6694f84':
2015-08-27 11:33:43 +00:00
Billy Lau
bc23f8e87f am 3d861fd1: (-s ours) am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '3d861fd129913305196f4b4587211508343e626d':
2015-08-27 11:33:42 +00:00
Amit Mahajan
eb22a7e5e8 am c1d2289b: (-s ours) am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'c1d2289bc627cd9b2103ee66e5251b9fa0676022':
2015-08-27 11:33:40 +00:00
Julia Reynolds
6f90c1e52c am cb271219: (-s ours) am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit 'cb271219c386a9a5280cfad63fa973631b552074':
2015-08-27 11:33:39 +00:00
Maurice Lam
be12776533 am c97e5aba: (-s ours) am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'c97e5aba84835ef126bee9cd4c288b4edb5d97fa':
2015-08-27 11:33:38 +00:00
Maurice Lam
63cccf0ee9 am a33b68af: (-s ours) am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit 'a33b68af3e6fac653eb0102fbba3f38d0ba00f07':
2015-08-27 11:33:36 +00:00
Maurice Lam
34b0d29c72 am ac4b7fac: (-s ours) am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit 'ac4b7fac6b5778f715adf2d71dd92e4408b625a0':
2015-08-27 11:33:35 +00:00