PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,086 Commits 1 Branch 0 Tags
7fe0c25f77e30c63eb486ae340ff8b1ce82c190c
Commit Graph

27086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pkanwar
7fe0c25f77 resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp 
Change-Id: I9213ec0dc937bd20ff705f4deb41c10a4e69c227
 2016-05-05 18:53:08 -07:00
pkanwar
de67e0b0cd The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users. 
am: 8fa3d44596

* commit '8fa3d44596e75cbc03f1eb5b478133360227bc66':
  The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users.

Change-Id: I7c3223eb2909f46b961c57f0321ffeb758b52547
 2016-05-05 20:46:17 +00:00
Maurice Lam
b4e93c2a83 Merge "Don\'t draw divider under headers" into nyc-mr1-dev 
am: 02e8a0d477

* commit '02e8a0d4779f151e3e7d5aa08d6423295f4c9031':
  Don't draw divider under headers

Change-Id: Iff646b0db3fd513130e1f7fb0d1de92dbaadfbd9
 2016-05-05 20:31:11 +00:00
Maurice Lam
02e8a0d477 Merge "Don't draw divider under headers" into nyc-mr1-dev 2016-05-05 20:19:55 +00:00
Fan Zhang
e8fc10ff79 Add estimate time under support options. 
am: be61a14fcd

* commit 'be61a14fcd01f5d8ccc2cb1584cea48b52697ce6':
  Add estimate time under support options.

Change-Id: I9f175ea6e0d2b58165d4544ce8fb712695f74db0
 2016-05-05 18:49:39 +00:00
pkanwar
8fa3d44596 The "device type" icons in "Bluetooth device list" screen are 
not accessible to TalkBack users.

b/28199679 Changed method to for setting the talk-back
attribute on "device type".

Change-Id: I63820d861ea1075195b98c82004ba95470448a53
 2016-05-05 11:25:46 -07:00
Rachel Zhang
bc250c382b Merge "Launch Help & Feedback" into nyc-mr1-dev 
am: 1529a875db

* commit '1529a875db917b4937ab37177d50e95c37b6d54c':
  Launch Help & Feedback

Change-Id: If5e8c0fee1ee11968f40933eca254cada8d91189
 2016-05-05 18:08:30 +00:00
Fan Zhang
be61a14fcd Add estimate time under support options. 
Bug: 28141203

- SupportFeatureProvider will provide a localized estimate string.
- Use a builder pattern to instantiate SupportData to avoid increasing
  constructor args.

Change-Id: I92e90cd57b4ef4e1d921f403801cfd5984ef6a3b
 2016-05-05 11:06:08 -07:00
Rachel Zhang
1529a875db Merge "Launch Help & Feedback" into nyc-mr1-dev 2016-05-05 17:58:14 +00:00
Android Build Merger (Role)
4f9d0c95c5 Merge "Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am: 56f7bc44a1 am: 48bd6631af" into nyc-mr1-dev-plus-aosp 2016-05-05 16:50:44 +00:00
Abodunrinwa Toki
99a0fbd9c4 Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am: 56f7bc44a1 
am: 48bd6631af

* commit '48bd6631afd8ca7c64dc23afa2d694b18932c127':
  InputSettings: Define order of items in Physical keyboards screen.

Change-Id: Icfc795b0473b21af94f5cf0e17f598fc95568ce6
 2016-05-05 16:50:33 +00:00
Abodunrinwa Toki
8d04317a27 Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am: 56f7bc44a1 
am: a1e8cd1163

* commit 'a1e8cd1163d93f69d8d92c723afbfac631a0787e':
  InputSettings: Define order of items in Physical keyboards screen.

Change-Id: I7c89dda0d0846fd316edcc92a773bfdd0e65129c
 2016-05-05 16:50:32 +00:00
Abodunrinwa Toki
a1e8cd1163 Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev 
am: 56f7bc44a1

* commit '56f7bc44a1d6474e1ce6b9631cdd8087f1577490':
  InputSettings: Define order of items in Physical keyboards screen.

Change-Id: Ib08f573cfaee03892e6366425ed0610286ee9445
 2016-05-05 16:46:48 +00:00
Abodunrinwa Toki
48bd6631af Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev 
am: 56f7bc44a1

* commit '56f7bc44a1d6474e1ce6b9631cdd8087f1577490':
  InputSettings: Define order of items in Physical keyboards screen.

Change-Id: If981f9c6d29aaaaf9c1667e930a10fc1f1c82419
 2016-05-05 16:46:48 +00:00
Abodunrinwa Toki
56f7bc44a1 Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev 2016-05-05 16:40:58 +00:00
Jason Monk
aa91cfe46b Merge "Don\'t crash on non-app data usage" into nyc-dev am: d1a4e452ed 
am: 1c06aedc3f

* commit '1c06aedc3fb8a973ae14fe3793bc239d3df862eb':

Change-Id: Ief5cbe7214d1d4f3af477acffde314c9bacfc386
 2016-05-05 15:55:53 +00:00
Jason Monk
abbea55388 Merge "Fix cell data limit dialog title" into nyc-dev am: 2a6bc40d49 
am: 0c7d11fe56

* commit '0c7d11fe568ec258165f6b94b916c72a533b09d7':

Change-Id: Ie21f67d2295be1e208a8e0cbbb14742afe3900d5
 2016-05-05 15:55:52 +00:00
Jason Monk
6a0f1d6997 Merge "Don\'t crash on non-app data usage" into nyc-dev am: d1a4e452ed 
am: 9c38c20900

* commit '9c38c209001d0151bc4e58a2b5c8f95bfb2d1cc4':
  Don't crash on non-app data usage

Change-Id: If07b3e928a6daabfdfb82144211f4e2996ec2b87
 2016-05-05 15:53:25 +00:00
Jason Monk
ce1fa74716 Merge "Fix cell data limit dialog title" into nyc-dev am: 2a6bc40d49 
am: 6f71ed9dbb

* commit '6f71ed9dbb92fae8bcd4aa32000f656f7efd8467':
  Fix cell data limit dialog title

Change-Id: I480483e8a259c0c8ebfea79f82dbd09a30e44093
 2016-05-05 15:53:24 +00:00
Jason Monk
9c38c20900 Merge "Don\'t crash on non-app data usage" into nyc-dev 
am: d1a4e452ed

* commit 'd1a4e452ed659f4f52b0b72f54da1100c6b1f512':
  Don't crash on non-app data usage

Change-Id: I46b35f11555442c2b7e1301d1dec8ee95807f36c
 2016-05-05 15:47:54 +00:00
Jason Monk
6f71ed9dbb Merge "Fix cell data limit dialog title" into nyc-dev 
am: 2a6bc40d49

* commit '2a6bc40d497d1bc0fdfc9cc86bc4db72791909b7':
  Fix cell data limit dialog title

Change-Id: Ia087f0ace8cb1f9a3c93ced1b3500207b6d63cf4
 2016-05-05 15:47:54 +00:00
Jason Monk
1c06aedc3f Merge "Don\'t crash on non-app data usage" into nyc-dev 
am: d1a4e452ed

* commit 'd1a4e452ed659f4f52b0b72f54da1100c6b1f512':
  Don't crash on non-app data usage

Change-Id: Ia43d98b016a2786dc5ad22e8f2a013b09bcff83d
 2016-05-05 15:47:50 +00:00
Jason Monk
0c7d11fe56 Merge "Fix cell data limit dialog title" into nyc-dev 
am: 2a6bc40d49

* commit '2a6bc40d497d1bc0fdfc9cc86bc4db72791909b7':
  Fix cell data limit dialog title

Change-Id: Ief4e72d16cb49592c08e284ec14af383125f7ae8
 2016-05-05 15:47:50 +00:00
Jason Monk
d1a4e452ed Merge "Don't crash on non-app data usage" into nyc-dev 2016-05-05 15:41:17 +00:00
Jason Monk
2a6bc40d49 Merge "Fix cell data limit dialog title" into nyc-dev 2016-05-05 15:40:51 +00:00
Android Build Merger (Role)
7d72db5f7d Merge "Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am: de4b51c8ce am: ce2201a04c" into nyc-mr1-dev-plus-aosp 2016-05-05 13:59:48 +00:00
Tony Mak
6f1bc8a28e Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am: de4b51c8ce 
am: a428e704e0

* commit 'a428e704e02499321b7b3b4393659394973a85e7':
  Should forward the intent even if its activity is disabled in Settings

Change-Id: Ia82393fcebaa31b788d3af98291a4a7628f59787
 2016-05-05 13:59:34 +00:00
Tony Mak
74ef0d19ed Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am: de4b51c8ce 
am: ce2201a04c

* commit 'ce2201a04c824fa8cc0376e786f511a2067b0a77':
  Should forward the intent even if its activity is disabled in Settings

Change-Id: I3fc793f36f1440fa5c2a1adbd098fc451462b178
 2016-05-05 13:59:34 +00:00
Tony Mak
a428e704e0 Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev 
am: de4b51c8ce

* commit 'de4b51c8ce4d16ef086ad04532113a942b267f1a':
  Should forward the intent even if its activity is disabled in Settings

Change-Id: Ifeee1ee85084aa668ca3f7083db80cdf4da3beb9
 2016-05-05 13:57:03 +00:00
Tony Mak
ce2201a04c Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev 
am: de4b51c8ce

* commit 'de4b51c8ce4d16ef086ad04532113a942b267f1a':
  Should forward the intent even if its activity is disabled in Settings

Change-Id: I3f2c1ce85fc96f299b931a99036f72e1e2478bd8
 2016-05-05 13:57:03 +00:00
Tony Mak
de4b51c8ce Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev 2016-05-05 13:50:10 +00:00
Abodunrinwa Toki
226e452c15 InputSettings: Define order of items in Physical keyboards screen. 
Bug: 28158120
Change-Id: Ia7cec64edb9da53a2048865e317b2b9d4b2059b0
 2016-05-05 13:52:03 +01:00
Maurice Lam
cf19ef7596 Don't draw divider under headers 
Create SettingsDividerItemDecoration which reads PreferenceViewHolder
isDividerAllowedAbove/Below so that will be taken into account as
well as other ViewHolders which implements DividedViewHolder.

Bug: 28445348
Change-Id: I73e298f2ca1688b135e533a8d3ef5f5c154963f7
 2016-05-04 15:24:58 -07:00
Philip P. Moltmann
5833ba4869 Merge "Do not set order for print services settings." into nyc-dev am: de4e43edda 
am: c43f32d331

* commit 'c43f32d33113d583af3afdd69661a1ff8e56d378':

Change-Id: I82ae791c4c275ebb704961efb204046431179de0
 2016-05-04 21:51:31 +00:00
Robin Lee
ee75357488 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 662731fb55 
am: eb36dbea1f

* commit 'eb36dbea1ff194940c86efd61b2aa1131b96e0f3':

Change-Id: I26a94de28ba124025d9500459c6e134e137681e9
 2016-05-04 21:51:30 +00:00
Hyunyoung Song
8d75f22935 Merge "Add shortcut manager support to Settings (2/2) b/28298258" into nyc-mr1-dev 
am: 5a3e547143

* commit '5a3e5471430d00892beb05ec55dc466c2039a36a':
  Add shortcut manager support to Settings (2/2) b/28298258

Change-Id: I88f02a0d70880f171d742b3fe0652f21baf25a70
 2016-05-04 21:49:47 +00:00
Philip P. Moltmann
58f93f1645 Merge "Do not set order for print services settings." into nyc-dev am: de4e43edda 
am: 5cc5f2d70e

* commit '5cc5f2d70eaa51ad2c7577e923e2350ed5642d4a':
  Do not set order for print services settings.

Change-Id: I5a457d0b2f81121f74b70a5981510becf99b49ca
 2016-05-04 21:49:46 +00:00
Robin Lee
6dd792e2cd Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 662731fb55 
am: ed5f33740c

* commit 'ed5f33740cf0305cd723f4a5415423bf5fa969c4':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I3d924e1e8dd69c2392cd09d8c048de7d96b01f40
 2016-05-04 21:49:45 +00:00
Hyunyoung Song
5a3e547143 Merge "Add shortcut manager support to Settings (2/2) b/28298258" into nyc-mr1-dev 2016-05-04 20:43:10 +00:00
Jason Monk
a058ae0dda Fix cell data limit dialog title 
Change-Id: I0303bc74bb7b0e46ed020d255baf2465c7db0fc5
Fixes: 27604216
 2016-05-04 15:46:05 -04:00
Philip P. Moltmann
c43f32d331 Merge "Do not set order for print services settings." into nyc-dev 
am: de4e43edda

* commit 'de4e43eddae70b63671083fd6fc95de7df1ed2fd':
  Do not set order for print services settings.

Change-Id: Ibca759a4db12c5edb913711344a860cff75022ee
 2016-05-04 19:19:06 +00:00
Philip P. Moltmann
5cc5f2d70e Merge "Do not set order for print services settings." into nyc-dev 
am: de4e43edda

* commit 'de4e43eddae70b63671083fd6fc95de7df1ed2fd':
  Do not set order for print services settings.

Change-Id: Icb3b9ca85af76635eb64a60a45cd91fc13ab7bb1
 2016-05-04 19:19:06 +00:00
Philip P. Moltmann
de4e43edda Merge "Do not set order for print services settings." into nyc-dev 2016-05-04 19:08:49 +00:00
Robin Lee
eb36dbea1f Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 
am: 662731fb55

* commit '662731fb55971cb81d52dd611075c7a5df5eb023':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I843e1e6da26237465dd054267a1031d7e38bdbc0
 2016-05-04 18:58:17 +00:00
Robin Lee
ed5f33740c Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 
am: 662731fb55

* commit '662731fb55971cb81d52dd611075c7a5df5eb023':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I0730abfe3c7cbec60f3961f5c9d8e111c2e8a5ac
 2016-05-04 18:54:52 +00:00
Hyunyoung Song
79ec6df771 Add shortcut manager support to Settings (2/2) 
b/28298258

Locale change will be handled in future CL/ dynamic shortcut list
change using a UI will be handled in follow up CL.

Change-Id: I5468b17e8c8b32625139ab0484d5d0386be0961d
 2016-05-04 18:52:03 +00:00
Robin Lee
662731fb55 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:28 +00:00
Fan Zhang
aa21c1b07a Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev 
am: 00b127b134

* commit '00b127b134ff41ea14ec56fdd33c076e1ccffc1c':
  Bring escalation options UI closer to mock.

Change-Id: I4e97594c7ea9d5c70f0629fae2c0f894a3fbab08
 2016-05-04 18:03:42 +00:00
Jeff Sharkey
ff74ebff5a Merge "UX polish tweaks to FallbackHome." into nyc-dev am: e50853f485 
am: 6c2fccfabf

* commit '6c2fccfabfd3faf30d9e646a133e058096f39a7b':

Change-Id: I560d0fd886b79ae1f6556ce20a19e8807d03cc52
 2016-05-04 18:03:29 +00:00
Jeff Sharkey
6bb1f8146b Merge "UX polish tweaks to FallbackHome." into nyc-dev am: e50853f485 
am: 0d613ab2cf

* commit '0d613ab2cf31d9a6608e5cf4b7e0f5e82ae89969':
  UX polish tweaks to FallbackHome.

Change-Id: Ib6ef02d4a2f073b12b4079af82569489585fab93
 2016-05-04 18:00:35 +00:00