Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,786 Commits 1 Branch 0 Tags
517ff0deee8fe244dbf0257b814bc7bfd435f167
Commit Graph

27786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Baligh Uddin
d74cbcc701 Import translations. DO NOT MERGE am: 61e99fed5b -s ours am: cce4c8e845 -s ours 
am: afc6bbe462  -s ours

* commit 'afc6bbe462694f1f8671e6c43bea0ae9e40b3658':

Change-Id: I829a730374ff144e2d83075605e399527eabc37f
 2016-05-04 00:47:41 +00:00
Baligh Uddin
afc6bbe462 Import translations. DO NOT MERGE am: 61e99fed5b -s ours 
am: cce4c8e845  -s ours

* commit 'cce4c8e845f4d5096c82da25e872c35854b3b0f3':

Change-Id: I1b1d2cc5bcebe17fc155b07670585e1bbc708cc6
 2016-05-04 00:39:47 +00:00
Baligh Uddin
2771509240 Import translations. DO NOT MERGE am: 61e99fed5b -s ours am: bf78b8c221 -s ours 
am: d1f7546063  -s ours

* commit 'd1f75460632a14ff1ecb3b4d379b6b4c0fbc66cc':
  Import translations. DO NOT MERGE

Change-Id: I8c6f829aa10eed9a55d9ac0716e8b17acf855de5
 2016-05-04 00:38:05 +00:00
Baligh Uddin
d1f7546063 Import translations. DO NOT MERGE am: 61e99fed5b -s ours 
am: bf78b8c221  -s ours

* commit 'bf78b8c221beefc4e75553fc3cc15110d4affc8b':
  Import translations. DO NOT MERGE

Change-Id: Ic4bc471614c30426dc016f49e004bfa4ff988606
 2016-05-04 00:29:06 +00:00
Baligh Uddin
cce4c8e845 Import translations. DO NOT MERGE 
am: 61e99fed5b  -s ours

* commit '61e99fed5bf1791f0cc73199f8d99d9519a9f811':
  Import translations. DO NOT MERGE

Change-Id: I6f32a88ec655e494347168c37cb0ecba7ebea8ba
 2016-05-04 00:23:48 +00:00
Baligh Uddin
bf78b8c221 Import translations. DO NOT MERGE 
am: 61e99fed5b  -s ours

* commit '61e99fed5bf1791f0cc73199f8d99d9519a9f811':
  Import translations. DO NOT MERGE

Change-Id: Ic97822a7035c3c0ec954714c304ea1b4461ad094
 2016-05-04 00:23:42 +00:00
Daniel Nishi
30eaf00f3c Fix a bug where negative file sizes were being used. 
Negative file sizes for packages occurs when the file size is either
unknown or if an error occurred during size calculation. As a result,
we can skip them for total freeable space calculations.

Bug: 28465884
Change-Id: I340d725a66a228fd94993781c5e8ef732a60a7b3
 2016-05-03 17:21:51 -07:00
Baligh Uddin
61e99fed5b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I7f6bb467fe967635f9febafb61764b596d075fa3
 2016-05-03 17:00:33 -07:00
Andrew Sapperstein
efac090258 Merge "Null check intent before starting "learn more"." into nyc-mr1-dev am: bc25322de8 
am: 30b566e7c6

* commit '30b566e7c6d94509bcf713b1947a1a758f0e0c05':
  Null check intent before starting "learn more".

Change-Id: I18a8b20baf16bc22862a97739993545bfb1a4980
 2016-05-03 19:48:45 +00:00
Jason Monk
ddc44490d6 Merge "Fix leaks" into nyc-dev am: ea8ee68507 am: 065f27b14b 
am: 3d4b3e768c

* commit '3d4b3e768cfbc05c8ecf6a27c38e91b2a21771a1':

Change-Id: Id130ee66eb2da4d338dc28d802dfe79a4d06d366
 2016-05-03 19:48:44 +00:00
Jason Monk
30e2ab7a81 Merge "Fix leaks" into nyc-dev am: ea8ee68507 am: 639ed29bae 
am: f239345b0c

* commit 'f239345b0c4de4e40e31f762855737508a576075':
  Fix leaks

Change-Id: Ibc8d921ac97b303e76438d011f487fae97267624
 2016-05-03 19:48:43 +00:00
Andrew Sapperstein
30b566e7c6 Merge "Null check intent before starting "learn more"." into nyc-mr1-dev 
am: bc25322de8

* commit 'bc25322de81dd149e407f8eb9f9ecd90bc1394bc':
  Null check intent before starting "learn more".

Change-Id: I0ca8a07f16a3aa68a87796eb2c840fdbf468a363
 2016-05-03 19:45:50 +00:00
Jason Monk
3d4b3e768c Merge "Fix leaks" into nyc-dev am: ea8ee68507 
am: 065f27b14b

* commit '065f27b14bb99592a8aa9002d238b7f3ab031b69':

Change-Id: Ife8809f1749868c99af377611240ff46322e5e5a
 2016-05-03 19:45:07 +00:00
TreeHugger Robot
bc25322de8 Merge "Null check intent before starting "learn more"." into nyc-mr1-dev 2016-05-03 19:43:30 +00:00
Jason Monk
f239345b0c Merge "Fix leaks" into nyc-dev am: ea8ee68507 
am: 639ed29bae

* commit '639ed29bae86891616643d00ffe143639e9cbb41':
  Fix leaks

Change-Id: Ib37a585ad37575abe7ef04f3c7d4b3024210738e
 2016-05-03 19:42:19 +00:00
Jason Monk
639ed29bae Merge "Fix leaks" into nyc-dev 
am: ea8ee68507

* commit 'ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
  Fix leaks

Change-Id: Ibf93ffeda0bca5e554da3462647ba207d0f9653f
 2016-05-03 19:39:59 +00:00
Jason Monk
065f27b14b Merge "Fix leaks" into nyc-dev 
am: ea8ee68507

* commit 'ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
  Fix leaks

Change-Id: I5fffa584a7e265533c17b341636421ee99d4812c
 2016-05-03 19:39:59 +00:00
Jason Monk
ea8ee68507 Merge "Fix leaks" into nyc-dev 2016-05-03 19:36:34 +00:00
Jason Monk
4e8d3013a2 Fix leaks 
Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes: 28074995
 2016-05-03 15:24:05 -04:00
Jason Monk
68cfd43ad1 Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 am: bf96779cbf 
am: f681c515cd

* commit 'f681c515cdab554bf2eb39b81681d901dd055c80':

Change-Id: I52bdbb736c8dc2a58ab30870d7957615cd93a2fe
 2016-05-03 18:47:30 +00:00
Jason Monk
0d05f33739 Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 am: 508e93babd 
am: 22ac2b749a

* commit '22ac2b749a43bf61295571d20c3ecee7ca0d26d9':
  Try to fix receiver crash

Change-Id: I4304d0147a856ba6bd767836cb8588e146cf4c60
 2016-05-03 18:47:29 +00:00
Jason Monk
f681c515cd Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 
am: bf96779cbf

* commit 'bf96779cbf24603de712856d6b646e30586714d7':

Change-Id: I0e224054779528a95e4fdb0c3e5d53455584878b
 2016-05-03 18:45:41 +00:00
Jason Monk
22ac2b749a Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 
am: 508e93babd

* commit '508e93babdab9cde97721670bbcd0fbc4a5a1e28':
  Try to fix receiver crash

Change-Id: I9f839090a913905358283f15a6930446209078c4
 2016-05-03 18:44:38 +00:00