OSDN Git Service
Mihai Niță [Wed, 24 Feb 2016 16:18:32 +0000 (16:18 +0000)]
Merge "Fix various UX bugs." into nyc-dev am:
ceb80c9888
am:
2c1664b414
* commit '
2c1664b414b4f4ede76f678e6f4cade12a7743c8':
Fix various UX bugs.
Andres Morales [Wed, 24 Feb 2016 16:14:14 +0000 (16:14 +0000)]
Merge "fix issue when cancelling OEM unlocking change" into nyc-dev am:
cc81fb8875
am:
6987b28d94
* commit '
6987b28d94501ef4caf1a6aad4d064b31b48e91c':
fix issue when cancelling OEM unlocking change
Mihai Niță [Wed, 24 Feb 2016 16:14:14 +0000 (16:14 +0000)]
Merge "Fix various UX bugs." into nyc-dev
am:
ceb80c9888
* commit '
ceb80c988815de59d674bf4f9b97dbd70b26755d':
Fix various UX bugs.
Andres Morales [Wed, 24 Feb 2016 16:10:18 +0000 (16:10 +0000)]
Merge "fix issue when cancelling OEM unlocking change" into nyc-dev
am:
cc81fb8875
* commit '
cc81fb8875f07773ad28fe049ab62edc434e8788':
fix issue when cancelling OEM unlocking change
Mihai Niță [Wed, 24 Feb 2016 16:08:16 +0000 (16:08 +0000)]
Merge "Fix various UX bugs." into nyc-dev
Andres Morales [Wed, 24 Feb 2016 16:05:21 +0000 (16:05 +0000)]
Merge "fix issue when cancelling OEM unlocking change" into nyc-dev
Geoff Mendal [Wed, 24 Feb 2016 15:39:28 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9b67583c64 -s ours
am:
2c3f97ec3e -s ours
* commit '
2c3f97ec3e69760eb08468bfba5ff79771e83350':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Feb 2016 15:35:13 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
9b67583c64 -s ours
* commit '
9b67583c64a58e34f8af5f498801064151dabdc8':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Feb 2016 15:29:34 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 24 Feb 2016 15:27:58 +0000 (07:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idfebdeda93da8d39d8fa69293cc0ddbf6911b1ab
Auto-generated-cl: translation import
Jason Monk [Wed, 24 Feb 2016 15:01:52 +0000 (15:01 +0000)]
Merge "Spell checker settings updates" into nyc-dev am:
8d41c2049a
am:
a69fe868ad
* commit '
a69fe868ad579b6b98480f63756e4bbf7b767192':
Spell checker settings updates
Jason Monk [Wed, 24 Feb 2016 14:57:46 +0000 (14:57 +0000)]
Merge "Spell checker settings updates" into nyc-dev
am:
8d41c2049a
* commit '
8d41c2049ac72ab7760145133b897f9e2df2ba8f':
Spell checker settings updates
Jason Monk [Wed, 24 Feb 2016 14:53:15 +0000 (14:53 +0000)]
Merge "Spell checker settings updates" into nyc-dev
Jason Monk [Sat, 20 Feb 2016 18:35:04 +0000 (13:35 -0500)]
Spell checker settings updates
Bug:
26108333
Change-Id: I41e5da4a41978262283bc494a76c887e281266a8
Sudheer Shanka [Wed, 24 Feb 2016 14:41:37 +0000 (14:41 +0000)]
Merge "Update the admin app icon in the support dialog." into nyc-dev am:
df1cbdcf56
am:
29fca4709f
* commit '
29fca4709f48ca2d9fc786f6dfe3326301c3f9d8':
Update the admin app icon in the support dialog.
Sudheer Shanka [Wed, 24 Feb 2016 14:37:38 +0000 (14:37 +0000)]
Merge "Update the admin app icon in the support dialog." into nyc-dev
am:
df1cbdcf56
* commit '
df1cbdcf56945c0eb86ecbfd247341b94b0aa563':
Update the admin app icon in the support dialog.
Geoff Mendal [Wed, 24 Feb 2016 14:36:15 +0000 (14:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Jason Monk [Wed, 24 Feb 2016 14:33:18 +0000 (14:33 +0000)]
Merge changes I24a9d34d,I443e9d2b into nyc-dev am:
346c1f4f24
am:
59ed2c9dcf
* commit '
59ed2c9dcf3f1148337186a297f480225330888e':
Add default app prefs to app info
Rearrange configure/default apps
Sudheer Shanka [Wed, 24 Feb 2016 14:32:53 +0000 (14:32 +0000)]
Merge "Update the admin app icon in the support dialog." into nyc-dev
Geoff Mendal [Wed, 24 Feb 2016 14:31:20 +0000 (06:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia18342e825e90b6ba624ff953fa5478ec269401b
Auto-generated-cl: translation import
Jason Monk [Wed, 24 Feb 2016 14:29:30 +0000 (14:29 +0000)]
Merge "Fix and update battery detail page" into nyc-dev am:
e4cf5b20a1
am:
a889e86494
* commit '
a889e8649433d624c3a160a4650b203331a11f62':
Fix and update battery detail page
Jason Monk [Wed, 24 Feb 2016 14:29:10 +0000 (14:29 +0000)]
Merge changes I24a9d34d,I443e9d2b into nyc-dev
am:
346c1f4f24
* commit '
346c1f4f2461fc7c38e4c2ad87f26864ad4fa347':
Add default app prefs to app info
Rearrange configure/default apps
Jason Monk [Wed, 24 Feb 2016 14:25:01 +0000 (14:25 +0000)]
Merge "Fix and update battery detail page" into nyc-dev
am:
e4cf5b20a1
* commit '
e4cf5b20a1f78bcb1267e49d7faf96359bcacce0':
Fix and update battery detail page
Jason Monk [Wed, 24 Feb 2016 14:22:37 +0000 (14:22 +0000)]
Merge changes I24a9d34d,I443e9d2b into nyc-dev
* changes:
Add default app prefs to app info
Rearrange configure/default apps
Jason Monk [Wed, 24 Feb 2016 14:21:18 +0000 (14:21 +0000)]
Merge "Fix and update battery detail page" into nyc-dev
Jason Monk [Tue, 23 Feb 2016 22:28:29 +0000 (17:28 -0500)]
Add default app prefs to app info
This makes them easier to discover and to know the state of them.
Bug:
27276982
Change-Id: I24a9d34d7e189b19df39cc0b9028b6412f76aa05
Jason Monk [Tue, 23 Feb 2016 20:31:09 +0000 (15:31 -0500)]
Rearrange configure/default apps
Bug:
27276982
Bug:
27279305
Change-Id: I443e9d2bc0c3fd9bcc13ee86716c14fbb55af0ba
Jeff Sharkey [Wed, 24 Feb 2016 04:02:06 +0000 (04:02 +0000)]
Merge "Make fallback home a bit more graceful." into nyc-dev am:
e57f7cbc8c
am:
fd862887eb
* commit '
fd862887ebedc52179b2b71f63af8479208d51f2':
Make fallback home a bit more graceful.
Jeff Sharkey [Wed, 24 Feb 2016 03:55:17 +0000 (03:55 +0000)]
Merge "Make fallback home a bit more graceful." into nyc-dev
am:
e57f7cbc8c
* commit '
e57f7cbc8c80d298bbbd63b7536acd67c7f95df4':
Make fallback home a bit more graceful.
Jeff Sharkey [Wed, 24 Feb 2016 03:48:59 +0000 (03:48 +0000)]
Merge "Make fallback home a bit more graceful." into nyc-dev
Jeff Sharkey [Wed, 24 Feb 2016 03:48:01 +0000 (20:48 -0700)]
Make fallback home a bit more graceful.
This change switches the theme used so we show through to the
wallpaper (instead of showing black), which makes initial device
startup less jarring.
Bug:
26458596
Change-Id: I73c7f1cf25dd21cb4a4012fb62f8828eb46a8368
Christopher Tate [Wed, 24 Feb 2016 03:28:28 +0000 (03:28 +0000)]
No separators in the list of hosts whose links apps open am:
1a157e69b4
am:
927cc57399
* commit '
927cc573995b2158ebbd605ed6522de3bf9fc8b9':
No separators in the list of hosts whose links apps open
Christopher Tate [Wed, 24 Feb 2016 03:21:42 +0000 (03:21 +0000)]
No separators in the list of hosts whose links apps open
am:
1a157e69b4
* commit '
1a157e69b4f190a0f6bf2992a397c830b215f3cb':
No separators in the list of hosts whose links apps open
Christopher Tate [Wed, 24 Feb 2016 03:09:19 +0000 (19:09 -0800)]
No separators in the list of hosts whose links apps open
Bug
26692858
Change-Id: Ia2de5cb7200994f997037fad988c7e87e91b31e2
Clara Bayarri [Wed, 24 Feb 2016 00:39:24 +0000 (00:39 +0000)]
Respect admin disallow fingerprint in ConfirmDeviceCredentials am:
bad66071cc
am:
b9dffd5ae1
* commit '
b9dffd5ae131c46247c5e5bcdc9d38b21a113137':
Respect admin disallow fingerprint in ConfirmDeviceCredentials
Clara Bayarri [Wed, 24 Feb 2016 00:32:26 +0000 (00:32 +0000)]
Respect admin disallow fingerprint in ConfirmDeviceCredentials
am:
bad66071cc
* commit '
bad66071cceb0a64fbdbe7c1b142a183769ec0b9':
Respect admin disallow fingerprint in ConfirmDeviceCredentials
Clara Bayarri [Thu, 18 Feb 2016 15:52:49 +0000 (15:52 +0000)]
Respect admin disallow fingerprint in ConfirmDeviceCredentials
Bug:
26891832
Change-Id: I4c6377fb79fa31e6059149220c854c47ad53eda7
Dianne Hackborn [Tue, 23 Feb 2016 23:11:52 +0000 (23:11 +0000)]
Merge "Fix issue #
27291496: Remove Background Check from Settings / Dev Options" into nyc-dev am:
e50ed4ac72
am:
50f59a10e1
* commit '
50f59a10e134cad9738e8a2f6d78571b06b805db':
Fix issue #
27291496: Remove Background Check from Settings / Dev Options
Noah Wang [Tue, 23 Feb 2016 23:04:30 +0000 (23:04 +0000)]
Merge "Fix hard-coded colors for accessibility screens to work with night mode" into nyc-dev am:
4f6df7464a
am:
e7c2dd2a2b
* commit '
e7c2dd2a2ba52a4db425feb62d7f34604d928db0':
Fix hard-coded colors for accessibility screens to work with night mode
Dianne Hackborn [Tue, 23 Feb 2016 22:58:27 +0000 (22:58 +0000)]
Merge "Fix issue #
27291496: Remove Background Check from Settings / Dev Options" into nyc-dev
am:
e50ed4ac72
* commit '
e50ed4ac729407727e7078bc80e94379d5f9bcf8':
Fix issue #
27291496: Remove Background Check from Settings / Dev Options
Noah Wang [Tue, 23 Feb 2016 22:58:17 +0000 (22:58 +0000)]
Merge "Fix hard-coded colors for accessibility screens to work with night mode" into nyc-dev
am:
4f6df7464a
* commit '
4f6df7464aab2bced32bf2b28816276a3218ffcb':
Fix hard-coded colors for accessibility screens to work with night mode
Dianne Hackborn [Tue, 23 Feb 2016 22:46:20 +0000 (22:46 +0000)]
Merge "Fix issue #
27291496: Remove Background Check from Settings / Dev Options" into nyc-dev
Noah Wang [Tue, 23 Feb 2016 22:39:20 +0000 (22:39 +0000)]
Merge "Fix hard-coded colors for accessibility screens to work with night mode" into nyc-dev
Noah Wang [Tue, 23 Feb 2016 21:44:39 +0000 (13:44 -0800)]
Fix hard-coded colors for accessibility screens to work with night mode
bug:
27257764
Change-Id: I885cdc44dc75cd6aeefe92de3735ff679fdddb6a
Baligh Uddin [Tue, 23 Feb 2016 21:34:47 +0000 (21:34 +0000)]
Import translations. DO NOT MERGE am:
f20e68c94c -s ours
am:
9a4eef94ec -s ours
* commit '
9a4eef94eced673c72c4cf2d7d92b19ced882df1':
Import translations. DO NOT MERGE
Dianne Hackborn [Tue, 23 Feb 2016 21:27:29 +0000 (13:27 -0800)]
Fix issue #
27291496: Remove Background Check from Settings / Dev Options
Change-Id: Ifb72a125e1ab73c3f6ab970a970ca0d97d701173
Baligh Uddin [Tue, 23 Feb 2016 21:27:15 +0000 (21:27 +0000)]
Import translations. DO NOT MERGE
am:
f20e68c94c -s ours
* commit '
f20e68c94cdb9d3363844b58876ba50c61edbc92':
Import translations. DO NOT MERGE
Mihai Nita [Mon, 22 Feb 2016 23:44:40 +0000 (15:44 -0800)]
Fix various UX bugs.
* In the drag & drop list align numbers with the + in
the "+ Add a language" button
* Keep the "+ Add a language" button under the list
* Shadow cell while drag & drop
* Updated various strings for dialog titles and messages
Bug:
26557242
Bug:
26710677
Bug:
26712004
Bug:
27070104
Change-Id: I10d26eac9581c955328e667d7309b5f0ac649110
Clara Bayarri [Tue, 23 Feb 2016 20:39:26 +0000 (20:39 +0000)]
Make Work profile lock unification a toggle am:
56462d668a
am:
5432320b59
* commit '
5432320b59b6ac4b40720af55e5ca88ebe26e1ff':
Make Work profile lock unification a toggle
Clara Bayarri [Tue, 23 Feb 2016 20:33:40 +0000 (20:33 +0000)]
Make Work profile lock unification a toggle
am:
56462d668a
* commit '
56462d668a7a81ef17c01b1ca70a9d462eae79d2':
Make Work profile lock unification a toggle
Clara Bayarri [Fri, 12 Feb 2016 13:55:36 +0000 (13:55 +0000)]
Make Work profile lock unification a toggle
The setting to unify work and personal locks is now a toggle,
and therefore always available.
When unifying, if the work lock is sufficient as a device lock
we confirm both locks and set the work lock as the device lock.
If the work lock is not sufficient for the device, the user is
informed and taken to the lock setup flow to set a new unified
lock for both.
Also fix related Strings given UX feedback.
Bug:
26816580
Change-Id: Id019234b0a5ff4462c5f9ba86e53e30981a03e0d
Alan Viverette [Tue, 23 Feb 2016 18:57:09 +0000 (18:57 +0000)]
Merge "Change Display size option "normal" to "default"" into nyc-dev am:
7f9c2849f7
am:
208b0e8133
* commit '
208b0e813349b253bfc561727cfe4f4e09725656':
Change Display size option "normal" to "default"
Alan Viverette [Tue, 23 Feb 2016 18:46:48 +0000 (18:46 +0000)]
Merge "Change Display size option "normal" to "default"" into nyc-dev
am:
7f9c2849f7
* commit '
7f9c2849f7bceb22e7cfc4670f40c5c7c7bcc8b2':
Change Display size option "normal" to "default"
Alan Viverette [Tue, 23 Feb 2016 18:42:23 +0000 (18:42 +0000)]
Merge "Change Display size option "normal" to "default"" into nyc-dev
Felipe Leme [Tue, 23 Feb 2016 18:25:44 +0000 (18:25 +0000)]
Merge "Logs bugreport type metrics." into nyc-dev am:
372163f943
am:
4b3fe9f40a
* commit '
4b3fe9f40a43ee42af6dcb9a8898750f112546c4':
Logs bugreport type metrics.
Alan Viverette [Tue, 23 Feb 2016 18:17:16 +0000 (13:17 -0500)]
Change Display size option "normal" to "default"
Bug:
27274227
Change-Id: I83b949cabaf333aa45cfef1beaa986d66067fa53
Felipe Leme [Tue, 23 Feb 2016 18:14:23 +0000 (18:14 +0000)]
Merge "Logs bugreport type metrics." into nyc-dev
am:
372163f943
* commit '
372163f94390902ac569210cd3e36c3b9550a29d':
Logs bugreport type metrics.
Felipe Leme [Tue, 23 Feb 2016 18:11:45 +0000 (18:11 +0000)]
Merge "Logs bugreport type metrics." into nyc-dev
Baligh Uddin [Tue, 23 Feb 2016 17:50:35 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I52d0f7327dfa403c0f1f5a886b48036efb9c8b6a
Jason Monk [Tue, 23 Feb 2016 17:45:20 +0000 (12:45 -0500)]
Fix and update battery detail page
Bug:
27205329
Change-Id: Ie984348d59c1b15bec7283a94a94489f78cacb79
Clara Bayarri [Tue, 23 Feb 2016 17:32:41 +0000 (17:32 +0000)]
Merge "Move Profile Security Settings into Security Settings" into nyc-dev am:
9c299734bb
am:
2ce79425b8
* commit '
2ce79425b85e34015256499cab5717da66ce9ff2':
Move Profile Security Settings into Security Settings
Clara Bayarri [Tue, 23 Feb 2016 17:28:12 +0000 (17:28 +0000)]
Merge "Move Profile Security Settings into Security Settings" into nyc-dev
am:
9c299734bb
* commit '
9c299734bbe0b1b4772f5967068079d255dc35d5':
Move Profile Security Settings into Security Settings
Clara Bayarri [Tue, 23 Feb 2016 17:25:08 +0000 (17:25 +0000)]
Merge "Move Profile Security Settings into Security Settings" into nyc-dev
Felipe Leme [Mon, 22 Feb 2016 23:54:04 +0000 (15:54 -0800)]
Logs bugreport type metrics.
BUG:
26759986
Change-Id: Ie4045301fadfb608aa694bc9a9756a703dd194ed
Daniel Sandler [Tue, 23 Feb 2016 15:52:23 +0000 (15:52 +0000)]
Merge "Enhanced notification details." into nyc-dev am:
712568cd15
am:
54a644df34
* commit '
54a644df34ff0652eafc89b70684ca3787e8bce1':
Enhanced notification details.
Daniel Sandler [Tue, 23 Feb 2016 15:48:53 +0000 (15:48 +0000)]
Merge "Enhanced notification details." into nyc-dev
am:
712568cd15
* commit '
712568cd151158a989e5c75b13ac11d1e53901dc':
Enhanced notification details.
Daniel Sandler [Tue, 23 Feb 2016 15:44:41 +0000 (15:44 +0000)]
Merge "Enhanced notification details." into nyc-dev
Wale Ogunwale [Tue, 23 Feb 2016 02:45:43 +0000 (02:45 +0000)]
Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev am:
0b485bb523
am:
b075a4b699
* commit '
b075a4b6997121bc4f1e75aa9b519ff426b855b8':
Revert "Add developer option for freeform window support (2/2)"
Wale Ogunwale [Tue, 23 Feb 2016 02:38:56 +0000 (02:38 +0000)]
Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev
am:
0b485bb523
* commit '
0b485bb5233057507d01e4baa02f6ede72ed3306':
Revert "Add developer option for freeform window support (2/2)"
Wale Ogunwale [Tue, 23 Feb 2016 02:27:14 +0000 (02:27 +0000)]
Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev
Clara Bayarri [Thu, 28 Jan 2016 11:11:35 +0000 (11:11 +0000)]
Move Profile Security Settings into Security Settings
UX requested that we have the settings directly in Security instead
of having a separate screen as implemented previously.
Bug:
26806582
Change-Id: I55c44848621498afe63d3207a52c974c58f9eb78
Udam Saini [Tue, 23 Feb 2016 00:35:09 +0000 (00:35 +0000)]
Merge "Hides retry button in setup wizard during confirm stage." into nyc-dev am:
991fa2643e
am:
596c6db38a
* commit '
596c6db38a46bfd1e61d41701308743aee95ce67':
Hides retry button in setup wizard during confirm stage.
Udam Saini [Tue, 23 Feb 2016 00:27:34 +0000 (00:27 +0000)]
Merge "Fixes talkback accessibility on learn more link." into nyc-dev am:
1004769135
am:
37af49083b
* commit '
37af49083bad4e2b19c7e1424beef1b5b25613e0':
Fixes talkback accessibility on learn more link.
Udam Saini [Tue, 23 Feb 2016 00:26:48 +0000 (00:26 +0000)]
Merge "Hides retry button in setup wizard during confirm stage." into nyc-dev
am:
991fa2643e
* commit '
991fa2643e8fad3d0d848f88ebeeab704e486944':
Hides retry button in setup wizard during confirm stage.
Udam Saini [Tue, 23 Feb 2016 00:20:16 +0000 (00:20 +0000)]
Merge "Fixes talkback accessibility on learn more link." into nyc-dev
am:
1004769135
* commit '
1004769135507b26c6a626af1ca1da9cfc1e811d':
Fixes talkback accessibility on learn more link.
Udam Saini [Tue, 23 Feb 2016 00:19:25 +0000 (00:19 +0000)]
Merge "Hides retry button in setup wizard during confirm stage." into nyc-dev
Udam Saini [Tue, 23 Feb 2016 00:10:39 +0000 (00:10 +0000)]
Merge "Fixes talkback accessibility on learn more link." into nyc-dev
Wale Ogunwale [Mon, 22 Feb 2016 23:28:39 +0000 (15:28 -0800)]
Revert "Add developer option for freeform window support (2/2)"
This reverts commit
292b9fd2daf9d3222430a1a017623d2ce1a17471.
Will add back later and limit to non-user builds.
Bug:
27295415
Bug:
25276672
Bug:
24815256
Change-Id: Ide230449615318a0d3f4bc607724e7eaaf1d43c4
Udam Saini [Fri, 29 Jan 2016 02:12:53 +0000 (18:12 -0800)]
Hides retry button in setup wizard during confirm stage.
bug:
24803305
Change-Id: Ib5f47bbd266f50e74515594cc90f73953f8ec8ce
Sudheer Shanka [Mon, 22 Feb 2016 22:39:26 +0000 (22:39 +0000)]
Update the admin app icon in the support dialog.
Change-Id: Ia1212b682e9168340b8df678a5880f50ee579485
Udam Saini [Mon, 22 Feb 2016 21:45:07 +0000 (21:45 +0000)]
Merge "Moves the encryption interstitial to use the list layout" into nyc-dev am:
511107c09b
am:
9b58982210
* commit '
9b5898221082e72bd95dceb87311e8fdce437a51':
Moves the encryption interstitial to use the list layout
Udam Saini [Mon, 22 Feb 2016 21:37:59 +0000 (21:37 +0000)]
Merge "Moves the encryption interstitial to use the list layout" into nyc-dev
am:
511107c09b
* commit '
511107c09ba5daf5e674e278ea0d143360b5e449':
Moves the encryption interstitial to use the list layout
Udam Saini [Mon, 22 Feb 2016 21:29:29 +0000 (21:29 +0000)]
Merge "Moves the encryption interstitial to use the list layout" into nyc-dev
Alan Viverette [Mon, 22 Feb 2016 21:05:32 +0000 (21:05 +0000)]
Merge "Remove night mode from developer settings" into nyc-dev am:
f4ace6fe91
am:
4a24fb99e9
* commit '
4a24fb99e96d0be2c229368bd31c93532cb3b0b3':
Remove night mode from developer settings
Chris Tate [Mon, 22 Feb 2016 21:05:20 +0000 (21:05 +0000)]
Merge "Text: "...and other URLs" rather than "...and related URLs"" into nyc-dev am:
7893931a50
am:
9854ee56e7
* commit '
9854ee56e7db609bc1a39df608f8baa6565dc5d0':
Text: "...and other URLs" rather than "...and related URLs"
Jason Monk [Mon, 22 Feb 2016 21:05:08 +0000 (21:05 +0000)]
Merge "Fix data usage multi-sim stuff" into nyc-dev am:
2dd744f824
am:
f1e00c8df9
* commit '
f1e00c8df9234a3eb007bc0b79c27e872247b178':
Fix data usage multi-sim stuff
Jason Monk [Mon, 22 Feb 2016 21:04:55 +0000 (21:04 +0000)]
Merge "Fix wallpaper prefs being too tall" into nyc-dev am:
3795d708ce
am:
02736d1bf2
* commit '
02736d1bf2fd53fa7804a88fa5b79aabd03f07dc':
Fix wallpaper prefs being too tall
Alan Viverette [Mon, 22 Feb 2016 20:47:33 +0000 (20:47 +0000)]
Merge "Remove night mode from developer settings" into nyc-dev
am:
f4ace6fe91
* commit '
f4ace6fe91726665715312b0b0ec22a4ba360b61':
Remove night mode from developer settings
Chris Tate [Mon, 22 Feb 2016 20:47:15 +0000 (20:47 +0000)]
Merge "Text: "...and other URLs" rather than "...and related URLs"" into nyc-dev
am:
7893931a50
* commit '
7893931a505921f700a85bd2668f041d7d86bf1a':
Text: "...and other URLs" rather than "...and related URLs"
Jason Monk [Mon, 22 Feb 2016 20:46:59 +0000 (20:46 +0000)]
Merge "Fix data usage multi-sim stuff" into nyc-dev
am:
2dd744f824
* commit '
2dd744f824cfb07298ef7bba84cfd4ede84b8316':
Fix data usage multi-sim stuff
Alan Viverette [Mon, 22 Feb 2016 20:43:59 +0000 (20:43 +0000)]
Merge "Remove night mode from developer settings" into nyc-dev
Chris Tate [Mon, 22 Feb 2016 20:43:38 +0000 (20:43 +0000)]
Merge "Text: "...and other URLs" rather than "...and related URLs"" into nyc-dev
Jason Monk [Mon, 22 Feb 2016 20:38:57 +0000 (20:38 +0000)]
Merge "Fix data usage multi-sim stuff" into nyc-dev
Christopher Tate [Mon, 22 Feb 2016 20:28:19 +0000 (12:28 -0800)]
Text: "...and other URLs" rather than "...and related URLs"
Bug
26692609
Change-Id: Ibb4f44950f03d66df161aee2e0661b9db57b031f
Jason Monk [Mon, 22 Feb 2016 20:29:16 +0000 (20:29 +0000)]
Merge "Fix wallpaper prefs being too tall" into nyc-dev
am:
3795d708ce
* commit '
3795d708ce8a6898ef75f5e601f39b34840d80e8':
Fix wallpaper prefs being too tall
Andres Morales [Tue, 9 Feb 2016 19:10:10 +0000 (11:10 -0800)]
fix issue when cancelling OEM unlocking change
Bug:
26928752
Change-Id: Ibafe9df564f1035cbd6782d8982bc3b424ee3cb4
Jason Monk [Mon, 22 Feb 2016 20:22:37 +0000 (20:22 +0000)]
Merge "Fix wallpaper prefs being too tall" into nyc-dev
Jason Monk [Mon, 22 Feb 2016 20:21:45 +0000 (15:21 -0500)]
Fix wallpaper prefs being too tall
Change-Id: Iddb45c77eb5014a596e9f94e3a2a9065165b2711
Jason Monk [Mon, 22 Feb 2016 20:04:57 +0000 (15:04 -0500)]
Fix data usage multi-sim stuff
Bug:
26866568
Change-Id: I5d1a6547124c1744af7e30c5a02b46ca07cc81e8
Alan Viverette [Mon, 22 Feb 2016 18:47:50 +0000 (13:47 -0500)]
Remove night mode from developer settings
It's in SysUI Tuner now.
Change-Id: If1c248bfaa964b4f37155619a4c54f836d33e468
OSDN Git Service
