Alan Viverette
a49cce4f38
Rename night mode back to Night mode
...
Which is technically correct (the best correct) and appropriately
manages user expectations.
Change-Id: Ic1680bc47a0c7953afc01f3c678f19b0755062f4
2015-09-09 10:27:52 -04:00
Jorim Jaggi
7be2804da9
am 2ca86be4: am c0c0bf30: am 5cca5a5a: am b83cbe20: Fix build
...
* commit '2ca86be437a76cf94644ca6d838f6a70f7fab287':
Fix build
2015-09-08 22:16:53 +00:00
Jorim Jaggi
2ca86be437
am c0c0bf30: am 5cca5a5a: am b83cbe20: Fix build
...
* commit 'c0c0bf30095a47b7a82df87b08e4d55bb2105350':
Fix build
2015-09-08 22:07:52 +00:00
Jorim Jaggi
c0c0bf3009
am 5cca5a5a: am b83cbe20: Fix build
...
* commit '5cca5a5a2c54e3ca64df5a2dc7c7bdf4cecf6507':
Fix build
2015-09-08 22:02:24 +00:00
Jorim Jaggi
5cca5a5a2c
am b83cbe20: Fix build
...
* commit 'b83cbe202bd56cf542d898837474757dca3625f2':
Fix build
2015-09-08 21:53:45 +00:00
Jorim Jaggi
b83cbe202b
Fix build
...
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
2015-09-08 21:42:17 +00:00
Jorim Jaggi
a353262e0d
am 6599eb9a: am 52aca96c: am 64ea62a3: am 8c543276: Fix crash in fingerprint settings when rotating
...
* commit '6599eb9af255f1e0406b813d038737d5a3c11942':
Fix crash in fingerprint settings when rotating
2015-09-08 21:39:53 +00:00
Jorim Jaggi
6599eb9af2
am 52aca96c: am 64ea62a3: am 8c543276: Fix crash in fingerprint settings when rotating
...
* commit '52aca96c0bd1a52aab3e42c08b10fed7c5763773':
Fix crash in fingerprint settings when rotating
2015-09-08 21:36:04 +00:00
Jorim Jaggi
52aca96c0b
am 64ea62a3: am 8c543276: Fix crash in fingerprint settings when rotating
...
* commit '64ea62a30a416b46ecdb2042e052825b96702012':
Fix crash in fingerprint settings when rotating
2015-09-08 21:26:38 +00:00
Jorim Jaggi
64ea62a30a
am 8c543276: Fix crash in fingerprint settings when rotating
...
* commit '8c543276f1dd366bd142ce44a8e3084fddb22971':
Fix crash in fingerprint settings when rotating
2015-09-08 21:17:06 +00:00
Jorim Jaggi
8c543276f1
Fix crash in fingerprint settings when rotating
...
Fragments always need empty constructors.
Bug: 23806551
Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
2015-09-08 20:43:16 +00:00
Julia Reynolds
ec037c387d
Merge "Differentiate battery optimization string."
2015-09-08 17:14:02 +00:00
Julia Reynolds
f08185b8e3
Differentiate battery optimization string.
...
Bug: 23585186
Change-Id: If98629c7a3204f2600c9d7d9c257de24e826f085
2015-09-08 12:49:32 -04:00
Robin Lee
b5e37f1d45
Merge "Show installed user keys in Security Settings"
2015-09-08 16:03:26 +00:00
Geoff Mendal
68a28751a2
am 8375466f: (-s ours) am 593714a8: (-s ours) am f1e6378a: (-s ours) am f1a62026: (-s ours) Import translations. DO NOT MERGE
...
* commit '8375466fe9c0616d3ccdb66bafb135ec5de20cc9':
Import translations. DO NOT MERGE
2015-09-07 16:05:03 +00:00
Geoff Mendal
8375466fe9
am 593714a8: (-s ours) am f1e6378a: (-s ours) am f1a62026: (-s ours) Import translations. DO NOT MERGE
...
* commit '593714a8d135f7ddafd2ae369cfd09777afdb8e5':
Import translations. DO NOT MERGE
2015-09-07 15:58:42 +00:00
Geoff Mendal
593714a8d1
am f1e6378a: (-s ours) am f1a62026: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f1e6378a7e181fadd0ccd007dc7249d7ad250a24':
Import translations. DO NOT MERGE
2015-09-07 15:51:05 +00:00
Geoff Mendal
f1e6378a7e
am f1a62026: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f1a62026b83b54b5f234cd87df66fa32f754c914':
Import translations. DO NOT MERGE
2015-09-07 15:42:38 +00:00
Geoff Mendal
f1a62026b8
Import translations. DO NOT MERGE
...
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
2015-09-07 08:35:11 -07:00
Geoff Mendal
76381c3f42
Import translations. DO NOT MERGE
...
Change-Id: Ide5e5bf4e5da66bfb8246f90da690f447db2e411
Auto-generated-cl: translation import
2015-09-07 07:49:54 -07:00
Maurice Lam
8d6975eb25
Merge "Update setup wizard skip dialog strings"
2015-09-04 19:30:26 +00:00
Xiaohui Chen
cb9997fd68
Merge "Remove dead Nsd checkbox"
2015-09-04 17:42:35 +00:00
Xiaohui Chen
1466d901f1
Merge "Cleanup remaining USER_OWNER in Settings"
2015-09-04 17:42:22 +00:00
Maurice Lam
21d27b125f
Update setup wizard skip dialog strings
...
Change "Don't skip" to "Go back".
Bug: 23764890
Change-Id: I899ce893ddeb1cef94d1733871005fd0356ed475
2015-09-04 00:36:43 +00:00
Jason Monk
12d29a96a0
am 7af285b3: am 3f2ac58c: am 07b26bb3: am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
...
* commit '7af285b3fc8638f2caba31bb4a91e7cf9535f263':
Start tether service with redeliver intent
2015-09-03 18:46:50 +00:00
Jason Monk
7af285b3fc
am 3f2ac58c: am 07b26bb3: am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
...
* commit '3f2ac58c932311fa61bc848af7aceec6f0f3a63d':
Start tether service with redeliver intent
2015-09-03 18:36:00 +00:00
Xiaohui Chen
40aca2ceb4
Remove dead Nsd checkbox
...
It seems to be dead from few years ago. This cl just cleans things up.
See b/6449478 for context.
Change-Id: Ida5eca16df88c866d3557e12dcde8884706810c6
2015-09-03 11:29:45 -07:00
Jason Monk
3f2ac58c93
am 07b26bb3: am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
...
* commit '07b26bb3fcc35d990be7263afe546445d23938b2':
Start tether service with redeliver intent
2015-09-03 18:25:57 +00:00
Jason Monk
07b26bb3fc
am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
...
* commit '1cfaf01fdaba22884a126a84748cf3a619785b3e':
Start tether service with redeliver intent
2015-09-03 18:14:51 +00:00
Jason Monk
1cfaf01fda
Merge "Start tether service with redeliver intent" into mnc-dr-dev
2015-09-03 17:51:09 +00:00
Xiaohui Chen
6f03829e74
Cleanup remaining USER_OWNER in Settings
...
Bug: 19913735
Change-Id: I6894a7c81ed7504b02d533d9e9f65f800dbca895
2015-09-03 10:31:34 -07:00
Jorim Jaggi
98e3af770d
am 469447bb: am bfacb5f4: am 98d91550: am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
...
* commit '469447bb8c7a252034750aa215e809a45413e732':
Fix fingerprint settings ripples
2015-09-03 17:28:46 +00:00
Maurice Lam
321b27b67c
am 570852da: am 84afdfde: am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
...
* commit '570852da1875ad34d6d1b751e2bacaee8d7a9a1a':
[Fingerprint] Update strings for skip dialog
2015-09-03 17:28:44 +00:00
Sungmin Choi
56042b8c36
am eeb5f8f1: am a43a40ff: am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config
...
* commit 'eeb5f8f1a2d31a9231ebb96ce55abe2213900377':
To hide none security option, use config_hide_none_security_option config
2015-09-03 17:28:43 +00:00
Geoff Mendal
c4ee93a22e
am 10c447c2: (-s ours) am 532ebb9f: (-s ours) am 8ee8b379: (-s ours) am e182fa77: (-s ours) Import translations. DO NOT MERGE
...
* commit '10c447c2cdb09ec1bb092d35fb93911aeccbc2e4':
Import translations. DO NOT MERGE
2015-09-03 17:28:42 +00:00
Jason Monk
09ea9724fa
Start tether service with redeliver intent
...
So that the intent comes back when we are restarted rather than
null causing a crash.
Bug: 23678853
Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
2015-09-03 12:50:01 -04:00
Jorim Jaggi
469447bb8c
am bfacb5f4: am 98d91550: am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
...
* commit 'bfacb5f483b6fe8c117d8df9ab0a1bbe3909df26':
Fix fingerprint settings ripples
2015-09-03 06:23:58 +00:00
Maurice Lam
570852da18
am 84afdfde: am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
...
* commit '84afdfdefaa935764aff589799b3ccf3a2fa06a1':
[Fingerprint] Update strings for skip dialog
2015-09-03 06:23:36 +00:00
Sungmin Choi
eeb5f8f1a2
am a43a40ff: am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config
...
* commit 'a43a40ffe7e55a4421635fc0a47ede295f2d61ed':
To hide none security option, use config_hide_none_security_option config
2015-09-03 06:22:57 +00:00
Geoff Mendal
10c447c2cd
am 532ebb9f: (-s ours) am 8ee8b379: (-s ours) am e182fa77: (-s ours) Import translations. DO NOT MERGE
...
* commit '532ebb9f7afaf512567811fe8cdb9b74376b00c2':
Import translations. DO NOT MERGE
2015-09-03 06:21:36 +00:00
Jorim Jaggi
bfacb5f483
am 98d91550: am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
...
* commit '98d91550b624ca942fea7d096835c5bdf73f9af2':
Fix fingerprint settings ripples
2015-09-03 01:37:47 +00:00
Jorim Jaggi
98d91550b6
am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
...
* commit 'c624a72be19027a0784fb41575129b334ff02ae7':
Fix fingerprint settings ripples
2015-09-03 01:28:51 +00:00
Jorim Jaggi
c624a72be1
Merge "Fix fingerprint settings ripples" into mnc-dr-dev
2015-09-03 01:19:28 +00:00
Xiyuan Xia
c31bfb2dca
am 6642a642: am beebc958: am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
...
* commit '6642a642109b088d9b29f4374d55749c9c000995':
Fix races in ConfirmPassword/Pattern
2015-09-03 00:44:18 +00:00
Jorim Jaggi
1e2433693a
Fix fingerprint settings ripples
...
Bug: 22471044
Bug: 23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
2015-09-02 17:42:29 -07:00
Xiyuan Xia
6642a64210
am beebc958: am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
...
* commit 'beebc95884e15bc53594a6fa63e1dd7736eb4b93':
Fix races in ConfirmPassword/Pattern
2015-09-03 00:34:15 +00:00
Maurice Lam
84afdfdefa
am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
...
* commit '82db64e940905a18aae4e716f361b6a9a72d0a4e':
[Fingerprint] Update strings for skip dialog
2015-09-02 23:54:52 +00:00
Maurice Lam
82db64e940
am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
...
* commit 'd8723073bb802c0e75df20edbada5e47bd020057':
[Fingerprint] Update strings for skip dialog
2015-09-02 23:44:06 +00:00
Maurice Lam
d8723073bb
Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
2015-09-02 23:35:15 +00:00
Lifu Tang
02b86a3426
Merge "Created new task when launching injected activity"
2015-09-02 21:54:13 +00:00
