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

28734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
317b27a500 Merge "Import translations. DO NOT MERGE" into nyc-dev am: dad7b893b2 -s ours am: 5587701c86 -s ours 
am: a3aa83da32  -s ours

* commit 'a3aa83da324a1b80f6080bf135173736f9109eb2':

Change-Id: I7140e385ea295ef4f3ad2d73580ab59471adc75e
 2016-05-23 15:59:38 +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
3d4fe8b108 Merge "Import translations. DO NOT MERGE" into nyc-dev am: dad7b893b2 -s ours am: 08f2eaf5ae -s ours 
am: f99299b24e  -s ours

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

Change-Id: I293e15cb92eaab5ab6ecbb61141ec3c7187dbf1a
 2016-05-23 15:49:20 +00:00
Bill Yi
4886f5ea4d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: aa8fa12600 -s ours 
am: cbed4aa0a5  -s ours

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

Change-Id: I6a70b382d7a2dea94f259fab51cc656749bec733
 2016-05-23 15:45:30 +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
2e04a88104 Merge "Import translations. DO NOT MERGE" 2016-05-23 15:36:53 +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
Jason Monk
22ac48df13 Merge "Fix the momery leak in DrawOverlayDetails" am: 34646006ce am: 05c4c91a6c am: 9d16b2ddf3 
am: cca2d70b85

* commit 'cca2d70b8567bdada170c5f6f338dc660d36ff27':
  Fix the momery leak in DrawOverlayDetails

Change-Id: Icb2f184737fc2923f9cd998912efb7445e6dae56
 2016-05-23 14:31:45 +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
Felipe Leme
ec72048150 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 
am: 5fc3c7b089

* commit '5fc3c7b08949203e0b6357ee3195174b02488fa1':

Change-Id: I8d9989f3386b76ebbad8da1e761173fb10867dde
 2016-05-23 14:00:08 +00:00
Felipe Leme
b0ee0f17de Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev am: b103f4497d am: ddc0c42464 
am: 3fe0957d62

* commit '3fe0957d62180f01b5b017f32808c80545909e2e':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I3251bcbaeaf27a5b3805a8e09cdf421b9824e689
 2016-05-23 14:00:07 +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
Felipe Leme
3fe0957d62 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev am: b103f4497d 
am: ddc0c42464

* commit 'ddc0c42464b31a1c602006089c3769d9956dcb6f':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I0258e76b41420244589e40e967d218677828db06
 2016-05-23 13:57:07 +00:00
Felipe Leme
08d2f08144 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev am: b103f4497d 
am: 7ffd5a7bc5

* commit '7ffd5a7bc51607fdf304040031dd1d6364f72cb0':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I3fac79fb0fca958dff6b07324b1c3ff57838937a
 2016-05-23 13:57:07 +00:00
Felipe Leme
7ffd5a7bc5 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev 
am: b103f4497d

* commit 'b103f4497d0137fb47ebb51d5d26901300071fce':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I46dcd529ac09bcf6f152f034847cd11a8d4b24f1
 2016-05-23 13:54:17 +00:00
Felipe Leme
ddc0c42464 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev 
am: b103f4497d

* commit 'b103f4497d0137fb47ebb51d5d26901300071fce':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I63e6346d0d3a68037ddafb2a6b725eb41f09dd8e
 2016-05-23 13:54:16 +00:00
Bill Yi
1bc8bb2a70 Import translations. DO NOT MERGE 
Change-Id: Icbe6d3dd29d739afc90790826bee8f0fc2af028e
Auto-generated-cl: translation import
 2016-05-23 06:48:26 -07:00
TreeHugger Robot
b103f4497d Merge "Fixed whitelist stats so it's only logged on add." into nyc-dev 2016-05-23 13:45:55 +00:00
Bill Yi
906224c4dd Import translations. DO NOT MERGE 
Change-Id: I18ff7e3d70d30e76e01214b31c1df2065209f30f
Auto-generated-cl: translation import
 2016-05-23 06:35:00 -07:00
Bill Yi
797928a672 Import translations. DO NOT MERGE 
Change-Id: I1781c1d2edab8e31a79e9bced54f6749dcd9c59d
Auto-generated-cl: translation import
 2016-05-23 05:48:27 -07:00
Victor Chang
262b817ee5 Merge "Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: 4d43e9a764" into nyc-mr1-dev-plus-aosp 
am: 87d713cf7c

* commit '87d713cf7c25ad944518dfa0757a2928ddda5d67':

Change-Id: Ida92b41c06e97e6f42abbd06fcd0806ac8397040
 2016-05-23 12:11:11 +00:00
Victor Chang
3e28393c06 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: e8df0892d4 
am: 937b468fb2

* commit '937b468fb204105b514260960b23a965c29d8937':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: I6be2fb8eb33ae55d984f860f158175f5ab45e3d7
 2016-05-23 12:09:38 +00:00
Android Build Merger (Role)
87d713cf7c Merge "Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: 4d43e9a764" into nyc-mr1-dev-plus-aosp 2016-05-23 12:04:53 +00:00
Victor Chang
918c5c5551 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 
am: 4d43e9a764

* commit '4d43e9a764d3c1d9d6e6c7fb6f36ff3b46bae5a8':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: I73a10207712ba0c8ebf0ddbdb3a7b6680539e821
 2016-05-23 12:03:48 +00:00
Victor Chang
937b468fb2 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 
am: e8df0892d4

* commit 'e8df0892d427cd8eec0f43970e1241f8e42bc918':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: Iac21f081af2d0cbad3c1174134854cdbcc204ec6
 2016-05-23 12:03:44 +00:00
Victor Chang
4d43e9a764 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev 
am: b0054ec4e2

* commit 'b0054ec4e2275d8d0444b94c0560374630e077f6':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: I01cd2b287d78484c1653476b75b6d300dec0c34d
 2016-05-23 11:59:19 +00:00
Victor Chang
e8df0892d4 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev 
am: b0054ec4e2

* commit 'b0054ec4e2275d8d0444b94c0560374630e077f6':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: If02ac2e8ddb0438e3b96491686fcd57a646d5a1f
 2016-05-23 11:58:58 +00:00
Victor Chang
b0054ec4e2 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev 2016-05-23 11:51:54 +00:00
Baligh Uddin
5cc864c555 Import translations. DO NOT MERGE am: ffe930ec76 -s ours am: 21b7e430e0 -s ours 
am: 6e9d64ba33  -s ours

* commit '6e9d64ba334555f0b83cf400fb0e8ac6dff9e1e8':

Change-Id: Iba0d03b9f2a8237e7fd8c7b529b67de2fa67aad5
 2016-05-22 23:26:03 +00:00
Baligh Uddin
9c26b8a9f2 Import translations. DO NOT MERGE am: ffe930ec76 -s ours am: e973bb7182 -s ours 
am: 6744d9977e  -s ours

* commit '6744d9977e503755b414b2943cdb47cb118fcd84':
  Import translations. DO NOT MERGE

Change-Id: Ic7c46f9f0c5b9b48f2c9eddac249faac11fe3830
 2016-05-22 23:26:02 +00:00
Baligh Uddin
6e9d64ba33 Import translations. DO NOT MERGE am: ffe930ec76 -s ours 
am: 21b7e430e0  -s ours

* commit '21b7e430e0169d7b5a6f888c19ae37b1b503dec8':

Change-Id: I887f76c385a55621ba61f3621a81b86daea005b3
 2016-05-22 23:23:11 +00:00
Baligh Uddin
6744d9977e Import translations. DO NOT MERGE am: ffe930ec76 -s ours 
am: e973bb7182  -s ours

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

Change-Id: I8840558f1983641822a42322fa157fff5d07a7b7
 2016-05-22 23:22:48 +00:00
Baligh Uddin
e973bb7182 Import translations. DO NOT MERGE 
am: ffe930ec76  -s ours

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

Change-Id: I7414492ad43d04da52e362c754b3e2d7d86486f1
 2016-05-22 23:20:36 +00:00
Baligh Uddin
21b7e430e0 Import translations. DO NOT MERGE 
am: ffe930ec76  -s ours

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

Change-Id: Ie71c67e0abd0b08ced8672cae96d4800337c6992
 2016-05-22 23:20:05 +00:00
Baligh Uddin
ffe930ec76 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
 2016-05-21 13:10:17 -07:00
Maurice Lam
c1f787d032 Add skip button to fingerprint settings 
The landscape layout was missing the fingerprint button

Bug: 28810925
Change-Id: Ic47242abdac61985f86cc4837f1c25801ee1248c
 2016-05-20 19:03:25 -07:00
Daniel Nishi
5af567eca7 Materialize the button bar in the Deletion Helper. 
Older Android style buttons were used for the bottom button bar.
By changing them to use the buttonBarBottomStyle, they are updated
to flat buttons. The bottom button bar for settings preference
fragments now more closely tracks the Material Design spec as seen
here in [0].

The other Settings views which use the button bar buttons are the
Redaction settings and WiFi network picker in some contexts. These
should be unaffected as they are based on the SettingsActivity,
rather than the SettingsFragment, and inflate a different view.

[0] https://material-design.storage.googleapis.com/publish/material_v_8/material_ext_publish/0B7WCemMG6e0VaDdZWXpLXzNicjg/components_buttons_usage6.png

Bug: 28845586
Change-Id: I9ea55aa2fe1e76f8f952880675501cbb0f76719d
 2016-05-20 16:34:59 -07:00
Felipe Leme
b8c2af0185 Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e am: ec218b75ac 
am: 0316e470d1

* commit '0316e470d175a5c3b4840815010f00973b64fac5':

Change-Id: I34d343a3b9764610c1430f909e189964d5d28cb0
 2016-05-20 22:11:13 +00:00
Felipe Leme
6af9e6a8b4 Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e am: d21e63fe4b 
am: 1d6d3723ba

* commit '1d6d3723bae00d0b6fd3f19dc63b0cb396bbc367':
  Defined help page for Data Saver.

Change-Id: I5061c9969b538ad3e5f08b6ce95ab6d190955866
 2016-05-20 22:11:01 +00:00
Felipe Leme
0316e470d1 Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e 
am: ec218b75ac

* commit 'ec218b75accb4ab4007b96076b4e8fd997798dec':

Change-Id: Ia0be1f58f0fb1b8e64fbf4bbafcfd69b9abb72e8
 2016-05-20 22:09:27 +00:00