Commit Graph

10053 Commits

Author SHA1 Message Date
Jason Monk
59ed2c9dcf Merge changes I24a9d34d,I443e9d2b into nyc-dev
am: 346c1f4f24

* commit '346c1f4f2461fc7c38e4c2ad87f26864ad4fa347':
  Add default app prefs to app info
  Rearrange configure/default apps
2016-02-24 14:29:10 +00:00
Jason Monk
a889e86494 Merge "Fix and update battery detail page" into nyc-dev
am: e4cf5b20a1

* commit 'e4cf5b20a1f78bcb1267e49d7faf96359bcacce0':
  Fix and update battery detail page
2016-02-24 14:25:01 +00:00
Jason Monk
346c1f4f24 Merge changes I24a9d34d,I443e9d2b into nyc-dev
* changes:
  Add default app prefs to app info
  Rearrange configure/default apps
2016-02-24 14:22:37 +00:00
Jason Monk
e4cf5b20a1 Merge "Fix and update battery detail page" into nyc-dev 2016-02-24 14:21:18 +00:00
Jason Monk
91e2f89b0f Rearrange configure/default apps
Bug: 27276982
Bug: 27279305
Change-Id: I443e9d2bc0c3fd9bcc13ee86716c14fbb55af0ba
2016-02-24 08:55:01 -05:00
Jeff Sharkey
555a95ce3b Merge "Make fallback home a bit more graceful." into nyc-dev am: e57f7cbc8c
am: fd862887eb

* commit 'fd862887ebedc52179b2b71f63af8479208d51f2':
  Make fallback home a bit more graceful.
2016-02-24 04:02:06 +00:00
Jeff Sharkey
fd862887eb Merge "Make fallback home a bit more graceful." into nyc-dev
am: e57f7cbc8c

* commit 'e57f7cbc8c80d298bbbd63b7536acd67c7f95df4':
  Make fallback home a bit more graceful.
2016-02-24 03:55:17 +00:00
Jeff Sharkey
e57f7cbc8c Merge "Make fallback home a bit more graceful." into nyc-dev 2016-02-24 03:48:59 +00:00
Jeff Sharkey
e555a6f610 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
2016-02-23 20:48:03 -07:00
Christopher Tate
dcb89b1714 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
2016-02-24 03:28:28 +00:00
Christopher Tate
927cc57399 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
2016-02-24 03:21:42 +00:00
Christopher Tate
1a157e69b4 No separators in the list of hosts whose links apps open
Bug 26692858

Change-Id: Ia2de5cb7200994f997037fad988c7e87e91b31e2
2016-02-23 19:09:19 -08:00
Dianne Hackborn
5fc282b301 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
2016-02-23 23:11:52 +00:00
Noah Wang
c90ec511a5 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
2016-02-23 23:04:30 +00:00
Dianne Hackborn
50f59a10e1 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
2016-02-23 22:58:27 +00:00
Noah Wang
e7c2dd2a2b 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
2016-02-23 22:58:17 +00:00
Dianne Hackborn
e50ed4ac72 Merge "Fix issue #27291496: Remove Background Check from Settings / Dev Options" into nyc-dev 2016-02-23 22:46:20 +00:00
Noah Wang
4f6df7464a Merge "Fix hard-coded colors for accessibility screens to work with night mode" into nyc-dev 2016-02-23 22:39:21 +00:00
Noah Wang
dbab5c7fa6 Fix hard-coded colors for accessibility screens to work with night mode
bug: 27257764
Change-Id: I885cdc44dc75cd6aeefe92de3735ff679fdddb6a
2016-02-23 13:47:43 -08:00
Dianne Hackborn
4df0665477 Fix issue #27291496: Remove Background Check from Settings / Dev Options
Change-Id: Ifb72a125e1ab73c3f6ab970a970ca0d97d701173
2016-02-23 13:27:29 -08:00
Mihai Nita
a475fb1e06 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
2016-02-23 13:21:21 -08:00
Clara Bayarri
2d8a963a5c Make Work profile lock unification a toggle am: 56462d668a
am: 5432320b59

* commit '5432320b59b6ac4b40720af55e5ca88ebe26e1ff':
  Make Work profile lock unification a toggle
2016-02-23 20:39:26 +00:00
Clara Bayarri
5432320b59 Make Work profile lock unification a toggle
am: 56462d668a

* commit '56462d668a7a81ef17c01b1ca70a9d462eae79d2':
  Make Work profile lock unification a toggle
2016-02-23 20:33:40 +00:00
Clara Bayarri
56462d668a 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
2016-02-23 11:48:56 -08:00
Alan Viverette
c21db9b6ad Merge "Change Display size option "normal" to "default"" into nyc-dev am: 7f9c2849f7
am: 208b0e8133

* commit '208b0e813349b253bfc561727cfe4f4e09725656':
  Change Display size option "normal" to "default"
2016-02-23 18:57:09 +00:00
Alan Viverette
208b0e8133 Merge "Change Display size option "normal" to "default"" into nyc-dev
am: 7f9c2849f7

* commit '7f9c2849f7bceb22e7cfc4670f40c5c7c7bcc8b2':
  Change Display size option "normal" to "default"
2016-02-23 18:46:48 +00:00
Alan Viverette
94ecc81376 Change Display size option "normal" to "default"
Bug: 27274227
Change-Id: I83b949cabaf333aa45cfef1beaa986d66067fa53
2016-02-23 13:17:16 -05:00
Baligh Uddin
f20e68c94c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I52d0f7327dfa403c0f1f5a886b48036efb9c8b6a
2016-02-23 09:50:35 -08:00
Jason Monk
d1ea8a05b0 Fix and update battery detail page
Bug: 27205329
Change-Id: Ie984348d59c1b15bec7283a94a94489f78cacb79
2016-02-23 12:45:20 -05:00
Clara Bayarri
82fd6d8aa7 Merge "Move Profile Security Settings into Security Settings" into nyc-dev am: 9c299734bb
am: 2ce79425b8

* commit '2ce79425b85e34015256499cab5717da66ce9ff2':
  Move Profile Security Settings into Security Settings
2016-02-23 17:32:41 +00:00
Clara Bayarri
2ce79425b8 Merge "Move Profile Security Settings into Security Settings" into nyc-dev
am: 9c299734bb

* commit '9c299734bbe0b1b4772f5967068079d255dc35d5':
  Move Profile Security Settings into Security Settings
2016-02-23 17:28:12 +00:00
Clara Bayarri
9c299734bb Merge "Move Profile Security Settings into Security Settings" into nyc-dev 2016-02-23 17:25:08 +00:00
Daniel Sandler
72cef3db63 Merge "Enhanced notification details." into nyc-dev am: 712568cd15
am: 54a644df34

* commit '54a644df34ff0652eafc89b70684ca3787e8bce1':
  Enhanced notification details.
2016-02-23 15:52:23 +00:00
Daniel Sandler
54a644df34 Merge "Enhanced notification details." into nyc-dev
am: 712568cd15

* commit '712568cd151158a989e5c75b13ac11d1e53901dc':
  Enhanced notification details.
2016-02-23 15:48:53 +00:00
Daniel Sandler
712568cd15 Merge "Enhanced notification details." into nyc-dev 2016-02-23 15:44:41 +00:00
Wale Ogunwale
781a2d9741 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)"
2016-02-23 02:45:43 +00:00
Wale Ogunwale
b075a4b699 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)"
2016-02-23 02:38:56 +00:00
Wale Ogunwale
0b485bb523 Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev 2016-02-23 02:27:14 +00:00
Clara Bayarri
52681ece04 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
2016-02-22 16:56:50 -08:00
Udam Saini
682b57f328 Merge "Fixes talkback accessibility on learn more link." into nyc-dev am: 1004769135
am: 37af49083b

* commit '37af49083bad4e2b19c7e1424beef1b5b25613e0':
  Fixes talkback accessibility on learn more link.
2016-02-23 00:27:34 +00:00
Udam Saini
37af49083b Merge "Fixes talkback accessibility on learn more link." into nyc-dev
am: 1004769135

* commit '1004769135507b26c6a626af1ca1da9cfc1e811d':
  Fixes talkback accessibility on learn more link.
2016-02-23 00:20:16 +00:00
Udam Saini
1004769135 Merge "Fixes talkback accessibility on learn more link." into nyc-dev 2016-02-23 00:10:40 +00:00
Wale Ogunwale
a48c78ccfc Revert "Add developer option for freeform window support (2/2)"
This reverts commit 292b9fd2da.

Will add back later and limit to non-user builds.

Bug: 27295415
Bug: 25276672
Bug: 24815256
Change-Id: Ide230449615318a0d3f4bc607724e7eaaf1d43c4
2016-02-22 15:41:43 -08:00
Udam Saini
b64427ce07 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
2016-02-22 21:45:07 +00:00
Udam Saini
9b58982210 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
2016-02-22 21:37:59 +00:00
Udam Saini
511107c09b Merge "Moves the encryption interstitial to use the list layout" into nyc-dev 2016-02-22 21:29:30 +00:00
Alan Viverette
f393c865d7 Merge "Remove night mode from developer settings" into nyc-dev am: f4ace6fe91
am: 4a24fb99e9

* commit '4a24fb99e96d0be2c229368bd31c93532cb3b0b3':
  Remove night mode from developer settings
2016-02-22 21:05:32 +00:00
Chris Tate
85e27a8519 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"
2016-02-22 21:05:20 +00:00
Jason Monk
917b4f57f5 Merge "Fix wallpaper prefs being too tall" into nyc-dev am: 3795d708ce
am: 02736d1bf2

* commit '02736d1bf2fd53fa7804a88fa5b79aabd03f07dc':
  Fix wallpaper prefs being too tall
2016-02-22 21:04:55 +00:00
Alan Viverette
4a24fb99e9 Merge "Remove night mode from developer settings" into nyc-dev
am: f4ace6fe91

* commit 'f4ace6fe91726665715312b0b0ec22a4ba360b61':
  Remove night mode from developer settings
2016-02-22 20:47:33 +00:00