Commit Graph

25531 Commits

Author SHA1 Message Date
Paul Lawrence
ceb467296b Merge "Show second warning screen before converting to FBE" into nyc-dev
am: 642e1d9b59

* commit '642e1d9b59c174c3883e511092a1cce9d5ab251f':
  Show second warning screen before converting to FBE
2016-02-24 17:03:37 +00:00
Paul Lawrence
642e1d9b59 Merge "Show second warning screen before converting to FBE" into nyc-dev 2016-02-24 16:56:52 +00:00
Jason Monk
d80a7ff436 Merge "Show gear for apps that provide general settings intent" into nyc-dev
am: 5d052a38e5

* commit '5d052a38e56303be787c38972bb00231ac3757cc':
  Show gear for apps that provide general settings intent
2016-02-24 16:27:25 +00:00
Jason Monk
5d052a38e5 Merge "Show gear for apps that provide general settings intent" into nyc-dev 2016-02-24 16:23:01 +00:00
Mihai Niță
2c1664b414 Merge "Fix various UX bugs." into nyc-dev
am: ceb80c9888

* commit 'ceb80c988815de59d674bf4f9b97dbd70b26755d':
  Fix various UX bugs.
2016-02-24 16:14:14 +00:00
Andres Morales
6987b28d94 Merge "fix issue when cancelling OEM unlocking change" into nyc-dev
am: cc81fb8875

* commit 'cc81fb8875f07773ad28fe049ab62edc434e8788':
  fix issue when cancelling OEM unlocking change
2016-02-24 16:10:18 +00:00
Mihai Niță
ceb80c9888 Merge "Fix various UX bugs." into nyc-dev 2016-02-24 16:08:17 +00:00
Andres Morales
cc81fb8875 Merge "fix issue when cancelling OEM unlocking change" into nyc-dev 2016-02-24 16:05:21 +00:00
Geoff Mendal
2c3f97ec3e Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 9b67583c64  -s ours

* commit '9b67583c64a58e34f8af5f498801064151dabdc8':
  Import translations. DO NOT MERGE
2016-02-24 15:35:13 +00:00
Geoff Mendal
9b67583c64 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-24 15:29:34 +00:00
Geoff Mendal
40928ab658 Import translations. DO NOT MERGE
Change-Id: Idfebdeda93da8d39d8fa69293cc0ddbf6911b1ab
Auto-generated-cl: translation import
2016-02-24 07:27:58 -08:00
Jason Monk
0c55bb103c Show gear for apps that provide general settings intent
Bug: 27276982
Change-Id: If598e2901a25f5df2b76a87a95590a5ff831a2dc
2016-02-24 10:25:55 -05:00
Paul Lawrence
31467520ed Show second warning screen before converting to FBE
Bug: 27126952
Change-Id: If045a0676600f4f9611ab27cfb686b8078b3cd5a
2016-02-24 07:22:13 -08:00
Jason Monk
a69fe868ad Merge "Spell checker settings updates" into nyc-dev
am: 8d41c2049a

* commit '8d41c2049ac72ab7760145133b897f9e2df2ba8f':
  Spell checker settings updates
2016-02-24 14:57:46 +00:00
bohu
625bc4bd21 Emulator: avoid accessing null BluetoothAdapter
bug: 27324609
Emulator has no bluetooth support at this moment, and settings
should not crash in this case.

Change-Id: I1bfc6c907ac02d4798b6c118291e6a9d1bf23c7c
2016-02-24 06:55:16 -08:00
Jason Monk
8d41c2049a Merge "Spell checker settings updates" into nyc-dev 2016-02-24 14:53:15 +00:00
Jason Monk
42123f70c5 Spell checker settings updates
Bug: 26108333
Change-Id: I41e5da4a41978262283bc494a76c887e281266a8
2016-02-24 09:52:34 -05:00
Sudheer Shanka
29fca4709f 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.
2016-02-24 14:37:38 +00:00
Sudheer Shanka
df1cbdcf56 Merge "Update the admin app icon in the support dialog." into nyc-dev 2016-02-24 14:32:54 +00:00
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
2108d361bb 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
2016-02-24 08:55:01 -05: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
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
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
Clara Bayarri
b9dffd5ae1 Respect admin disallow fingerprint in ConfirmDeviceCredentials
am: bad66071cc

* commit 'bad66071cceb0a64fbdbe7c1b142a183769ec0b9':
  Respect admin disallow fingerprint in ConfirmDeviceCredentials
2016-02-24 00:32:26 +00:00
Clara Bayarri
bad66071cc Respect admin disallow fingerprint in ConfirmDeviceCredentials
Bug: 26891832
Change-Id: I4c6377fb79fa31e6059149220c854c47ad53eda7
2016-02-23 15:52:53 -08: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
Baligh Uddin
9a4eef94ec Import translations. DO NOT MERGE
am: f20e68c94c  -s ours

* commit 'f20e68c94cdb9d3363844b58876ba50c61edbc92':
  Import translations. DO NOT MERGE
2016-02-23 21:27:15 +00: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
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
Noah Wang
14f102915a Read out confirmation message upon selecting options on LabeledSeekBar.
bug: 26965949
Change-Id: I2693ac6849f5c72b2bbd4f775911ea18398746f6
2016-02-23 11:27:50 -08: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
7f9c2849f7 Merge "Change Display size option "normal" to "default"" into nyc-dev 2016-02-23 18:42:24 +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
Felipe Leme
4b3fe9f40a Merge "Logs bugreport type metrics." into nyc-dev
am: 372163f943

* commit '372163f94390902ac569210cd3e36c3b9550a29d':
  Logs bugreport type metrics.
2016-02-23 18:14:23 +00:00
Felipe Leme
372163f943 Merge "Logs bugreport type metrics." into nyc-dev 2016-02-23 18:11:45 +00: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