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

27577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Sapperstein
542c63384c Update alertDialogTheme to use proper colorAccent. 
am: 8da144bdee

* commit '8da144bdee8d6fcf90a5b42e2e726a5a3d05c82d':
  Update alertDialogTheme to use proper colorAccent.

Change-Id: I8e7790a5c7293bf81881ed5e14335e0840bedba6
 2016-05-25 03:45:40 +00:00
Andrew Sapperstein
8da144bdee Update alertDialogTheme to use proper colorAccent. 
The settings dialogs were all using the default colorAccent.
Now it uses the app's version.

BUG: 28760785

Change-Id: Ic9bf90745db7d2ef5b1fd047474bab5c6bbdab23
 2016-05-24 18:08:36 -07:00
Adrian Roos
aa98d45059 Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9 
am: 4b3ab5871c

* commit '4b3ab5871c0869eb0f51a08a6bc9aceede856090':

Change-Id: I2488f70caa3b2a735d02b16decba07d25a6af272
 2016-05-25 00:35:41 +00:00
Adrian Roos
7226630b67 Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9 
am: aea945a821

* commit 'aea945a82133cfc2704c14b214fd93e06624f4f3':
  Remove option to configure emergency app

Change-Id: I6fd3b85f96e22fb85960fcad56e09b8f8b0eef70
 2016-05-25 00:31:58 +00:00
Adrian Roos
aea945a821 Merge "Remove option to configure emergency app" into nyc-dev 
am: 06b7d7cdf9

* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
  Remove option to configure emergency app

Change-Id: I4643f4cae85c6e70d82a8a25f34c2f17305b240d
 2016-05-25 00:23:29 +00:00
Adrian Roos
4b3ab5871c Merge "Remove option to configure emergency app" into nyc-dev 
am: 06b7d7cdf9

* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
  Remove option to configure emergency app

Change-Id: Ia306455b8fe44d6e42493937fce6ad92904737fe
 2016-05-25 00:23:28 +00:00
TreeHugger Robot
06b7d7cdf9 Merge "Remove option to configure emergency app" into nyc-dev 2016-05-25 00:17:20 +00:00
Andrew Sapperstein
cd7376067c Merge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev 
am: 759ba9d152

* commit '759ba9d152296470fa8d4153726cf8a08e4bf51d':
  Replace bluetooth pngs with vector drawables.

Change-Id: I6c251e7207469ccbc6a147617aeed4af38138dcb
 2016-05-25 00:09:08 +00:00
TreeHugger Robot
759ba9d152 Merge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev 2016-05-24 23:50:30 +00:00
Daniel Nishi
5a546fbcaf Change Downloads to show individual files in the Deletion Helper. 
am: 1370f7ed20

* commit '1370f7ed200ae4442c1d4a159584c26bc86d8a63':
  Change Downloads to show individual files in the Deletion Helper.

Change-Id: I52237038b49acdd1122c4ade19e408463027b0bb
 2016-05-24 23:05:11 +00:00
Andrew Sapperstein
aeed7d481c Replace bluetooth pngs with vector drawables. 
The current pngs are hardcoded to the green accent color.
Instead, the new vector drawable replacements have colorAccent
set as a tint.

BUG: 28760785
Change-Id: I01853d4e93bca6651460ad86505d0943dc68bf93
 2016-05-24 15:32:12 -07:00
Daniel Nishi
ce584ff754 Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev 
am: 97ac5c773d

* commit '97ac5c773da07d637ef0e92edbde4052714683ab':
  Update the storage manager settings to match the mocks.

Change-Id: I9c6ed838d3f58fb97c93779c9378f59bb88b1b66
 2016-05-24 21:32:37 +00:00
Daniel Nishi
1370f7ed20 Change Downloads to show individual files in the Deletion Helper. 
The first implementation simply had every file in the Downloads folder
be under a single checkbox. This iteration makes Downloads an
expandable dropdown preference listing every single file individually
for selection to be deleted.

Bug: 28621781
Change-Id: I5169caf718cee4c0fa7f0248bc4c443984766005
 2016-05-24 14:26:38 -07:00
Andrew Sapperstein
38972c3809 Merge "Refactor Settings theme colors." into nyc-mr1-dev 
am: 076731b825

* commit '076731b8258bb9ed40cfef55c77c69f71fc86331':
  Refactor Settings theme colors.

Change-Id: I520678bf558b33476b705fb7d48a54ecd9b1b5fc
 2016-05-24 21:25:50 +00:00
Daniel Nishi
97ac5c773d Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev 2016-05-24 21:18:39 +00:00
TreeHugger Robot
076731b825 Merge "Refactor Settings theme colors." into nyc-mr1-dev 2016-05-24 21:13:24 +00:00
Andrew Sapperstein
8dd11327b6 Refactor Settings theme colors. 
Introduces stock colors (primary_color, primary_dark_color, etc) to allow
overriding the colors via resource overlays.

Creates new colorSecondary attribute and updates switches to use theme
attributes for foreground/background colors rather than hardcoded values.

Some other mild color cleanup to make things more straightforward.

BUG: 28760785
Change-Id: I4deba962357217bdb2e08c08e8f83b9b57a683d4
 2016-05-24 12:49:17 -07:00
Daniel Nishi
11b6563cb6 Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev 
am: c05c8617bc

* commit 'c05c8617bc1cb292b67b8c8d40723846914c20fc':
  Fix a crash where the deletion helper crashes when app sizes load.

Change-Id: I0f32008388d8f462df95d1655f43869031be0c20
 2016-05-24 15:45:58 +00:00
Daniel Nishi
c05c8617bc Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev 2016-05-24 15:36:22 +00:00
Android Build Merger (Role)
f1cbf0a3f2 Merge "Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 am: 8a85828424" into nyc-mr1-dev-plus-aosp 2016-05-24 14:24:22 +00:00
Victor Chang
0c9117a546 Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 
am: 8a85828424

* commit '8a858284242d428e9db69d337a717a48edc88714':
  Trust the certificate after unlocking screenlock

Change-Id: I6ec7b8cc19605ede281c8ed1f80e7647a0edea51
 2016-05-24 14:24:14 +00:00
Victor Chang
19a1107089 Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 
am: 8cc4630521

* commit '8cc4630521d649146087fc898c65446064305626':
  Trust the certificate after unlocking screenlock

Change-Id: I120f9d1fac3742af4c1467c68b1fc34c2ffc54f3
 2016-05-24 14:24:13 +00:00
Victor Chang
8cc4630521 Merge "Trust the certificate after unlocking screenlock" into nyc-dev 
am: 32e17d0862

* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
  Trust the certificate after unlocking screenlock

Change-Id: Id0f6da39fc3af71a85ebde93f854d2752c7422b5
 2016-05-24 14:20:02 +00:00
Victor Chang
8a85828424 Merge "Trust the certificate after unlocking screenlock" into nyc-dev 
am: 32e17d0862

* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
  Trust the certificate after unlocking screenlock

Change-Id: Ib9e51ab5dac5d0f9a7e938a056cd99a0af4c22de
 2016-05-24 14:20:01 +00:00
Victor Chang
32e17d0862 Merge "Trust the certificate after unlocking screenlock" into nyc-dev 2016-05-24 14:03:29 +00:00
Mahaver Chopra
150dd9cc4f Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev 
am: e6e8c92134

* commit 'e6e8c92134b7a212058d7728007407eb74720625':
  Disallow OEM unlock when DISALLOW_FACTORY_RESET applies

Change-Id: I2389a5518a55fc3131a91fb5a5d8af376d79d936
 2016-05-24 12:31:57 +00:00
Mahaver Chopra
e6e8c92134 Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev 2016-05-24 12:23:20 +00:00
Mahaver Chopra
dcf3d7c185 Disallow OEM unlock when DISALLOW_FACTORY_RESET applies 
Bug: 28339424
Change-Id: I2ccba997fc6c9ccfab802c0f49a9e2115a314552
 2016-05-24 12:04:49 +00:00
Maurice Lam
534d856458 Merge "Update margins to match specs" into nyc-mr1-dev 
am: 3b15d6234d

* commit '3b15d6234dc9097869030c1e5e2b26a9b34d1f19':
  Update margins to match specs

Change-Id: Iceacbab85dd0697708ddfad1b95b9faccae11a2d
 2016-05-24 00:54:11 +00:00
Maurice Lam
3b15d6234d Merge "Update margins to match specs" into nyc-mr1-dev 2016-05-24 00:45:15 +00:00
Maurice Lam
b357e4a81a Update margins to match specs 
- Update settings to use GLIF versions for margins and styles
- Removed learn more link from AOSP Fingerprint intro screen because
  it won't have a link to show.

Bug: 28885476
Change-Id: I5d2fd730a1bca2c5da8626da066da3a3f03b4428
 2016-05-23 14:51:22 -07:00
Daniel Nishi
f16b8be7b4 Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev 
am: 64b25588b7

* commit '64b25588b7aa1f377ffb1585c1a9f07c1705b7f0':
  Materialize the button bar in the Deletion Helper.

Change-Id: Iece17635fc4c7a0ffd112381068b39a84bc3daeb
 2016-05-23 20:28:56 +00:00
Daniel Nishi
ba03d2ff21 Update the storage manager settings to match the mocks. 
Bug: 28560570
Change-Id: I0f218da1d23b687e38c52b5a927f7b84645958c7
 2016-05-23 13:27:30 -07:00
Daniel Nishi
64b25588b7 Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev 2016-05-23 20:23:47 +00:00
Victor Chang
45ca906e27 Trust the certificate after unlocking screenlock 
When trust button is clicked, if ConfirmCredential (CC) is shown,
and user successfully unlock CC, trust the cert immediately

Bug: 28752364
Change-Id: Ied4aeda59a668a9dd2bf079a385b1fecd8eabb9e
 2016-05-23 20:11:18 +01:00
Maurice Lam
d39ac69ef1 Merge "Add skip button to fingerprint settings" into nyc-mr1-dev 
am: c2a929f06a

* commit 'c2a929f06ae98346fa1133c50e90888d496bc076':
  Add skip button to fingerprint settings

Change-Id: I0f7e22626ec6652bda5d663943cbf2b5875415a3
 2016-05-23 18:11:52 +00:00
Maurice Lam
c2a929f06a Merge "Add skip button to fingerprint settings" into nyc-mr1-dev 2016-05-23 17:56:02 +00:00
Bill Yi
a3aa83da32 Merge "Import translations. DO NOT MERGE" into nyc-dev am: dad7b893b2 -s ours 
am: 5587701c86  -s ours

* commit '5587701c86be3a78b9b08e3841ca186cbf2acc64':

Change-Id: I5c2fb2801b85c48fb52ae804323bee66f90b78f7
 2016-05-23 15:50:40 +00:00
Bill Yi
f99299b24e Merge "Import translations. DO NOT MERGE" into nyc-dev am: dad7b893b2 -s ours 
am: 08f2eaf5ae  -s ours

* commit '08f2eaf5ae693190d471c4aa58cc1eb3dbebadbb':
  Import translations. DO NOT MERGE

Change-Id: Ia5a070a172e8cde556308b23e35cce42b0c973b5
 2016-05-23 15:45:24 +00:00
Bill Yi
cbed4aa0a5 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: aa8fa12600  -s ours

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

Change-Id: Id38b5f8008eb22608714420fdc78b1f632ee222d
 2016-05-23 15:42:23 +00:00
Bill Yi
08f2eaf5ae Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: dad7b893b2  -s ours

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

Change-Id: I68fb81f437949a3e412f9f0b54c7f99fa32f8f8d
 2016-05-23 15:42:21 +00:00
Bill Yi
5587701c86 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: dad7b893b2  -s ours

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

Change-Id: Id29af55504af4e8cae67098379244cb9ec2e2db9
 2016-05-23 15:42:21 +00:00
TreeHugger Robot
dad7b893b2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:35:35 +00:00
TreeHugger Robot
aa8fa12600 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:34:20 +00:00
宋凯伦
cca2d70b85 Merge "Fix the momery leak in DrawOverlayDetails" am: 34646006ce am: 05c4c91a6c 
am: 9d16b2ddf3

* commit '9d16b2ddf3fb25e619cfd2ed9b643fa728a52e15':
  Fix the momery leak in DrawOverlayDetails

Change-Id: I2bf7b0a1a1bc98956aed0e537b4e1952dab0c435
 2016-05-23 14:28:50 +00:00
Jason Monk
9d16b2ddf3 Merge "Fix the momery leak in DrawOverlayDetails" am: 34646006ce 
am: 05c4c91a6c

* commit '05c4c91a6c6799527eae900973efea49875c97da':
  Fix the momery leak in DrawOverlayDetails

Change-Id: I9971a74e0afa36c275a70b171c101a3058c240eb
 2016-05-23 14:25:55 +00:00
宋凯伦
05c4c91a6c Merge "Fix the momery leak in DrawOverlayDetails" 
am: 34646006ce

* commit '34646006ce2eb98dea2324a12e707bb81c1423de':
  Fix the momery leak in DrawOverlayDetails

Change-Id: I0e4747602388e45fda4ef9ed42981d98ec5772de
 2016-05-23 14:23:08 +00:00
Jason Monk
34646006ce Merge "Fix the momery leak in DrawOverlayDetails" 2016-05-23 14:13:08 +00:00
宋凯伦
4feb4d9a8b Fix the momery leak in DrawOverlayDetails 
https://code.google.com/p/android/issues/detail?id=210852

we need to release the mOverlayBridge in onDestroy, or it will cause Memory Leak issue
Signed-off-by: 宋凯伦 <songkailun@xiaomi.com>

Change-Id: If0113ed72773c366596a2c915ec504c1c68fe3b7
 2016-05-23 14:12:34 +00:00
Android Build Merger (Role)
5fc3c7b089 Merge "Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev am: b103f4497d am: 7ffd5a7bc5" into nyc-mr1-dev-plus-aosp 2016-05-23 13:57:21 +00:00