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

27843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
d27fab1510 Merge "Don\'t crash on non-app data usage" into nyc-dev am: d1a4e452ed am: 1c06aedc3f 
am: aa91cfe46b

* commit 'aa91cfe46b5f27ab48d8f30e48694b83fed07315':

Change-Id: I62f5cd7a332b230af5bc61d897d0818a9b7cc02d
 2016-05-05 16:01:54 +00:00
Jason Monk
945690bea6 Merge "Fix cell data limit dialog title" into nyc-dev am: 2a6bc40d49 am: 0c7d11fe56 
am: abbea55388

* commit 'abbea5538832678aaf44e07683a7c80e2c405972':

Change-Id: I610dc416f01ff76675b227558f1b276475de7c66
 2016-05-05 16:01:53 +00:00
Jason Monk
9e4531f691 Merge "Don\'t crash on non-app data usage" into nyc-dev am: d1a4e452ed am: 9c38c20900 
am: 6a0f1d6997

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

Change-Id: If2678c2ef35d437b85b8fa1c8e125b39ea61cfed
 2016-05-05 16:01:52 +00:00
Jason Monk
6eb53e42e0 Merge "Fix cell data limit dialog title" into nyc-dev am: 2a6bc40d49 am: 6f71ed9dbb 
am: ce1fa74716

* commit 'ce1fa7471648daac5abe5d3d322de3798ab8aea9':
  Fix cell data limit dialog title

Change-Id: I4f337ad301b16edc173ff903d5105075b36782a2
 2016-05-05 16:01:50 +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
Tony Mak
0b86d7c546 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 
am: 7d72db5f7d

* commit '7d72db5f7de69b2b5afec968a743e194855cdaad':

Change-Id: I75939e3d47fa5e137556c752253699ea6fd62955
 2016-05-05 14:02:04 +00:00
Tony Mak
0f197a1c24 Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am: de4b51c8ce am: a428e704e0 
am: 6f1bc8a28e

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

Change-Id: I08a99bd1b013174ef83fb109e1bc38fcf8ffc419
 2016-05-05 14:02:03 +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
Philip P. Moltmann
6783190473 Merge "Do not set order for print services settings." into nyc-dev am: de4e43edda am: c43f32d331 
am: 5833ba4869

* commit '5833ba4869df93a60513eb8992efcad9b81f24b2':

Change-Id: Ic43792807f98fcbfd89138b07c0169494d3468ff
 2016-05-04 22:22:33 +00:00
Robin Lee
dc568bf473 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 662731fb55 am: eb36dbea1f 
am: ee75357488

* commit 'ee753574885ec59b0948e1c85039e77fb4953eea':

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

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

Change-Id: If888e8f269ad1d714dcbe2cfa05c84a41721847b
 2016-05-04 22:22:30 +00:00
Philip P. Moltmann
6e7c521936 Merge "Do not set order for print services settings." into nyc-dev am: de4e43edda am: 5cc5f2d70e 
am: 58f93f1645

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

Change-Id: I7be3cfa303fd4ac2859c5da1603ad8a8d2c26f38
 2016-05-04 22:22:28 +00:00
Robin Lee
ed2c7a33a9 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 662731fb55 am: ed5f33740c 
am: 6dd792e2cd

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

Change-Id: Ie610dee2521fd4e4b1caa986efa866100f6c929c
 2016-05-04 22:22:26 +00: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
Fan Zhang
1eef5f9445 Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev am: 00b127b134 
am: aa21c1b07a

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

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

* commit 'ff74ebff5ad4368411b5641670363658ba8c2f9e':

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

* commit '6bb1f8146b048110be3e25fdafe2d8045abaaae6':
  UX polish tweaks to FallbackHome.

Change-Id: I882caf4bc033a801936fa4321a99360b26abc29d
 2016-05-04 18:44:54 +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
Fan Zhang
00b127b134 Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev 2016-05-04 17:47:17 +00:00
Jason Monk
f82b3afdd6 Don't crash on non-app data usage 
Change-Id: Ib39fc280a892dea2e3e7cbe22339799ab51a6eca
Fixes: 28531037
 2016-05-04 13:43:26 -04:00
Jeff Sharkey
6c2fccfabf Merge "UX polish tweaks to FallbackHome." into nyc-dev 
am: e50853f485

* commit 'e50853f485fd99c14d6af8167b06fc0c5ae19a22':
  UX polish tweaks to FallbackHome.

Change-Id: I392867952c277fea71ab86389ed6df1e5e483b20
 2016-05-04 17:34:56 +00:00