PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,464 Commits 1 Branch 0 Tags
2e04a88104ba073b41a115f741d87cd0b82d173f
Commit Graph

28464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Sharkey
0d613ab2cf Merge "UX polish tweaks to FallbackHome." into nyc-dev 
am: e50853f485

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

Change-Id: I9fc3f4df1333e6e17bb7aa809f2a8a822697b616
 2016-05-04 17:34:55 +00:00
TreeHugger Robot
e50853f485 Merge "UX polish tweaks to FallbackHome." into nyc-dev 2016-05-04 17:13:16 +00:00
Philip P. Moltmann
7978909120 Do not set order for print services settings. 
What happened before was that negative number turned out to be order
behind ORDER_LAST.

Change-Id: I714f623a2b1be06dde86ae7f36b39c64006203f2
 2016-05-04 09:44:06 -07:00
Daniel Nishi
517ff0deee Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev am: 38cdbf7fdc 
am: f2ea09f405

* commit 'f2ea09f40534e65d23126964b90ba1d405ab0f1b':
  Fix a bug where negative file sizes were being used.

Change-Id: Ib73852cdb85368df7b32fcdca5bbb1aa62a83c8f
 2016-05-04 16:41:52 +00:00
Daniel Nishi
f2ea09f405 Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev 
am: 38cdbf7fdc

* commit '38cdbf7fdced67563f26c334dfa6c5dcf78eaecc':
  Fix a bug where negative file sizes were being used.

Change-Id: I177311d921c89f30545080b2fec73f95f81a30ef
 2016-05-04 16:31:26 +00:00
Daniel Nishi
38cdbf7fdc Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev 2016-05-04 16:13:24 +00:00
Fan Zhang
cd09151224 Bring escalation options UI closer to mock. 
Bug: 28141203
Change-Id: Ia6d50d7d6f3010695c62fc1e8bd07f858715e455
 2016-05-04 08:58:00 -07:00
Mahaver Chopra
58a2e0ec9c Merge "Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314 am: 49a3cc0fb6" into nyc-mr1-dev-plus-aosp 
am: 3d028b1de2

* commit '3d028b1de28ae324071e8d3c2567fb44514914e6':

Change-Id: I0bce4b9a3a7a9738f200fd98455a2a6ec34ab154
 2016-05-04 14:45:04 +00:00
Mahaver Chopra
168122bec1 Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314 am: b735c1baf7 
am: 1ebe441ae2

* commit '1ebe441ae2d35579705e79b63ece3dab6a045962':
  More informative title while choosing work lock.

Change-Id: I29a0a8e613954716b09746b4b15328fd9c184d38
 2016-05-04 14:45:01 +00:00
Android Build Merger (Role)
3d028b1de2 Merge "Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314 am: 49a3cc0fb6" into nyc-mr1-dev-plus-aosp 2016-05-04 14:32:12 +00:00
Mahaver Chopra
0251b4e902 Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314 
am: 49a3cc0fb6

* commit '49a3cc0fb683f28e907fdf7c72a21bffb6af43a8':
  More informative title while choosing work lock.

Change-Id: Ic463aa2e0c3640f5d22217837aa106be28e51523
 2016-05-04 14:31:56 +00:00
Mahaver Chopra
1ebe441ae2 Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314 
am: b735c1baf7

* commit 'b735c1baf7affe1bc26ce6be3abe605026f828e2':
  More informative title while choosing work lock.

Change-Id: I56a16ff55bf5c84ccecafb1f6e8d958fbe0890b0
 2016-05-04 14:31:53 +00:00
Mahaver Chopra
b735c1baf7 Merge "More informative title while choosing work lock." into nyc-dev 
am: 9efcb2e314

* commit '9efcb2e314f4c31de26cea629b03b436f7b84df1':
  More informative title while choosing work lock.

Change-Id: I38dce28a33ac847cba1f256d99ec2a0f092d5b4c
 2016-05-04 14:22:27 +00:00
Mahaver Chopra
49a3cc0fb6 Merge "More informative title while choosing work lock." into nyc-dev 
am: 9efcb2e314

* commit '9efcb2e314f4c31de26cea629b03b436f7b84df1':
  More informative title while choosing work lock.

Change-Id: Ib71598d4112cb10392fa32cc39aa10699ad6855e
 2016-05-04 14:22:27 +00:00
Mahaver Chopra
9efcb2e314 Merge "More informative title while choosing work lock." into nyc-dev 2016-05-04 14:03:09 +00:00
Nicolas Prevot
f4d22462ae Merge "Only ask for credentials in add account if user is locked." into nyc-dev am: 832c8e4fda am: 0eab365289 
am: d9699c254d

* commit 'd9699c254ddffbf5f396fbc7f9506c541c7ae495':

Change-Id: I182a9fb03c4d65917bbe379e4a174310fbf2ac2a
 2016-05-04 13:08:37 +00:00
Nicolas Prevot
cebc55e7a5 Merge "Only ask for credentials in add account if user is locked." into nyc-dev am: 832c8e4fda am: d16c520451 
am: dc47ac730e

* commit 'dc47ac730ec5489989f922b9a8c9cdd2d452a9d1':
  Only ask for credentials in add account if user is locked.

Change-Id: I3b4c678487222d68b209492897b960bbe9c142dd
 2016-05-04 13:08:32 +00:00
Nicolas Prévot
d9699c254d Merge "Only ask for credentials in add account if user is locked." into nyc-dev am: 832c8e4fda 
am: 0eab365289

* commit '0eab3652891460e3c4ce3582a14f682e5759fb55':

Change-Id: I84b70273827460caf65d04759eb06cf624579f1c
 2016-05-04 13:05:24 +00:00
Nicolas Prévot
dc47ac730e Merge "Only ask for credentials in add account if user is locked." into nyc-dev am: 832c8e4fda 
am: d16c520451

* commit 'd16c52045150854da9efad21623b24d6c443b373':
  Only ask for credentials in add account if user is locked.

Change-Id: Iaae924082368b59cec76b5720a604f4eb59f7deb
 2016-05-04 13:00:47 +00:00
Nicolas Prevot
d16c520451 Merge "Only ask for credentials in add account if user is locked." into nyc-dev 
am: 832c8e4fda

* commit '832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0':
  Only ask for credentials in add account if user is locked.

Change-Id: Ieacd13cc6536fd789b76246de550c4592cfe4b57
 2016-05-04 12:53:44 +00:00
Nicolas Prevot
0eab365289 Merge "Only ask for credentials in add account if user is locked." into nyc-dev 
am: 832c8e4fda

* commit '832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0':
  Only ask for credentials in add account if user is locked.

Change-Id: Ic93962179b1ce9ac19233810dbf065aedd662168
 2016-05-04 12:53:36 +00:00
Tony Mak
82d9096796 Should forward the intent even if its activity is disabled in Settings 
This fixes the cross profile intent filter test in CtsVerifier.
Activities of action APPLICATION_DEVELOPMENT_SETTINGS and
NFC_PAYMENT_SETTINGS are disabled in managed profile. But we still
want their corresponding intents to be forwarded to personal side.

Bug: 28426865

Change-Id: I65afc06f7faf4532d9e132f44c1faa49f47d1a2e
 2016-05-04 13:51:41 +01:00
Nicolas Prévot
832c8e4fda Merge "Only ask for credentials in add account if user is locked." into nyc-dev 2016-05-04 12:43:31 +00:00
Mahaver Chopra
bc18b40623 More informative title while choosing work lock. 
When Intent ACTION_SET_NEW_PASSWORD is called from a managed profile,
ChooseLockGeneric fragment shows title "Unlock Selection", update that to
"Choose work lock".

Bug: 28451356
Change-Id: I9bcf4698557fa453337aa666f10f94f15e7624fa
 2016-05-04 13:13:44 +01:00
Tony Mak
93642f34e4 Merge "Add managed profile setting page" into nyc-dev am: d5b3a5d342 am: b8cfa32bf1 
am: 755dc9b1b5

* commit '755dc9b1b5bfd811b394602ad8be9085f62ff550':

Change-Id: I2cfe1c1c504793bd71eadebdd70a34bc8fe8fb64
 2016-05-04 10:46:47 +00:00
Tony Mak
b38b537983 resolve merge conflicts of d5b3a5d to nyc-mr1-dev am: 8f14564787 
am: 2211926ac4

* commit '2211926ac4c24fcdfc635d58dc8c2dd2ec029d1c':
  Add managed profile setting page

Change-Id: I16a93e4527468de9005db3adfa598a924a3efa19
 2016-05-04 10:46:45 +00:00
Tony Mak
755dc9b1b5 Merge "Add managed profile setting page" into nyc-dev am: d5b3a5d342 
am: b8cfa32bf1

* commit 'b8cfa32bf1a91757002ce8e7dd7c134d9a57d6de':

Change-Id: I54f81ebdc56bc6f937a11e62cee1a70f3dd622f0
 2016-05-04 10:46:21 +00:00
Tony Mak
2211926ac4 resolve merge conflicts of d5b3a5d to nyc-mr1-dev 
am: 8f14564787

* commit '8f14564787da3705a895e945c72c890604d13cfd':
  Add managed profile setting page

Change-Id: If1f79ebf4127aac5d8eb7b5ce74c32e3ad145121
 2016-05-04 10:40:57 +00:00
Nicolas Prevot
bd4c570bfd Only ask for credentials in add account if user is locked. 
Also: if work mode is off, ask to turn work on before adding
a work account.

BUG:28220470
Change-Id: Ib23f87f056ad41c1f9713bb8d3c5263f015e6475
 2016-05-04 11:34:26 +01:00
Tony Mak
8f14564787 resolve merge conflicts of d5b3a5d to nyc-mr1-dev 
Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb
 2016-05-04 11:14:48 +01:00
Tony Mak
b8cfa32bf1 Merge "Add managed profile setting page" into nyc-dev 
am: d5b3a5d342

* commit 'd5b3a5d342d74411b0e4466541d5c5b1168eb803':
  Add managed profile setting page

Change-Id: I1ca66552fe44e7ace9ff7b314ab0f7af53ca1e6c
 2016-05-04 09:41:58 +00:00
Tony Mak
d5b3a5d342 Merge "Add managed profile setting page" into nyc-dev 2016-05-04 09:33:24 +00:00