PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,282 Commits 1 Branch 0 Tags
c51143a35ace37a8aeb3fea828dbf40f43c2b81c
Commit Graph

30282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Chang
54825c2ee0 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 am: 7a37b70bda 
am: fc9cbd17f3

* commit 'fc9cbd17f30879a5518cff7eaa56f926a6ec41f5':

Change-Id: Icf0efe91816e7682c9ae693fac9596182e1e4050
 2016-06-01 10:22:45 +00:00
Victor Chang
13adfba9ad Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 am: 5ab70294ed 
am: 24b39dce00

* commit '24b39dce002479369c782887b036f936cb27c776':
  Show different strings when PO/DO user approves a cert

Change-Id: Iced70f167bcf899a4dab8c16e048a90d41b0d310
 2016-06-01 10:22:44 +00:00
Victor Chang
fc9cbd17f3 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 
am: 7a37b70bda

* commit '7a37b70bda1bbc4a1ca8754c6a503111c1f9b4a0':

Change-Id: I51c3364033b106763fc7745600c9483d59eecbc3
 2016-06-01 10:18:27 +00:00
Victor Chang
24b39dce00 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 
am: 5ab70294ed

* commit '5ab70294ed03f83fd0789477a005225d8caebd5c':
  Show different strings when PO/DO user approves a cert

Change-Id: Ib0e1fc2a8f086e7ebf06b3f745f18c343a9ac682
 2016-06-01 10:18:07 +00:00
Victor Chang
5ab70294ed Merge "Show different strings when PO/DO user approves a cert" into nyc-dev 
am: 36522e8854

* commit '36522e885479b30bc49a8a7333f436d5744431bc':
  Show different strings when PO/DO user approves a cert

Change-Id: I1cf166e58afd13c0927eb4460a7d88a22ba9dfe7
 2016-06-01 10:13:52 +00:00
Victor Chang
7a37b70bda Merge "Show different strings when PO/DO user approves a cert" into nyc-dev 
am: 36522e8854

* commit '36522e885479b30bc49a8a7333f436d5744431bc':
  Show different strings when PO/DO user approves a cert

Change-Id: I5dd1261e9def95d952538736401bb4c16f6fb61a
 2016-06-01 10:13:51 +00:00
Victor Chang
36522e8854 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev 2016-06-01 10:07:16 +00:00
Tony Mak
cf55f787a9 Merge "Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: 0b86c6bcc6" into nyc-mr1-dev-plus-aosp 
am: 7d3cd0b1d3

* commit '7d3cd0b1d363a82c16df8c1e9f9ba9a752d42af4':

Change-Id: I1f4da304802b8a468c96cb1bbc982b06d2c4839d
 2016-06-01 09:52:49 +00:00
Tony Mak
94f187e0b4 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: caeb93ceda 
am: 2abfd032d5

* commit '2abfd032d5ed250981d02dfd2746f450c0b65631':
  Fix RTL issue in Trusted Credentail page

Change-Id: I5ad04475a651a885ae2228efb6cf10be56133864
 2016-06-01 09:52:48 +00:00
Android Build Merger (Role)
7d3cd0b1d3 Merge "Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: 0b86c6bcc6" into nyc-mr1-dev-plus-aosp 2016-06-01 09:48:40 +00:00
Tony Mak
2abfd032d5 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 
am: caeb93ceda

* commit 'caeb93ceda8bb07c015025a00714241a78a42976':
  Fix RTL issue in Trusted Credentail page

Change-Id: I603af8b3455cba99ee8bde3c9dce805b59c10c51
 2016-06-01 09:48:27 +00:00
Tony Mak
ed66066174 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 
am: 0b86c6bcc6

* commit '0b86c6bcc65a8df9cb78b2fdc41f4ad0b71550ff':
  Fix RTL issue in Trusted Credentail page

Change-Id: I0e3dff9ef8b4019ba5badb6b159268013f92b172
 2016-06-01 09:48:27 +00:00
Tony Mak
caeb93ceda Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev 
am: ffb10f8156

* commit 'ffb10f8156b42261340362ee440002dd7f0a5c5b':
  Fix RTL issue in Trusted Credentail page

Change-Id: Ib91896687a2c5297ae9f1454b0b7729e2dd670a7
 2016-06-01 09:44:06 +00:00
Tony Mak
0b86c6bcc6 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev 
am: ffb10f8156

* commit 'ffb10f8156b42261340362ee440002dd7f0a5c5b':
  Fix RTL issue in Trusted Credentail page

Change-Id: I0d5504ccca59ee03b7ad8efbd26128f394721b82
 2016-06-01 09:44:06 +00:00
Tony Mak
ffb10f8156 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev 2016-06-01 09:36:51 +00:00
宋凯伦
0fb2f2bd00 Fix the memory leak in TetherSettings 
https://code.google.com/p/android/issues/detail?id=210848

We need to close the bluetooth adapter's profile proxy in OnDestroy 
method, or it will cause TetherSettings object to be held and won't
release. And finally it will cause OOM issue.
Change-Id: Id7667f751697c8ef9fccaaabfed28a91d4fa4960
Signed-off-by: 宋凯伦 <songkailun@xiaomi.com>
 2016-06-01 02:13:50 +00:00
Meng Wang
fddffa539d Launch E911 address management activity at turning on Wifi Calling am: 90e8e4713c 
am: 0500f2bede

* commit '0500f2bedefe3ecf61e395d5a2285c6972024b3d':
  Launch E911 address management activity at turning on Wifi Calling

Change-Id: Ibcc27498999a5f2f62589bab349318cbdb6f2a50
 2016-06-01 00:57:14 +00:00
Meng Wang
0500f2bede Launch E911 address management activity at turning on Wifi Calling 
am: 90e8e4713c

* commit '90e8e4713c7710f765868ed90f69e2424eb19fe5':
  Launch E911 address management activity at turning on Wifi Calling

Change-Id: Ie526f9a5c0d6f66c5e8c79c6ac3299a4aa5a4db6
 2016-06-01 00:46:33 +00:00
Meng Wang
90e8e4713c Launch E911 address management activity at turning on Wifi Calling 
Bug: 28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f
 2016-05-31 15:57:27 -07:00
Victor Chang
71d1fed0e7 Show different strings when PO/DO user approves a cert 
1. This is confusing for restricted users who don't have any options other
than 'Trust'.
2. show dialog title of "Check certificate" instead of "Trust or remove certificate"

The change only applies to ProfileOwner and DeviceOwner case

Fix: 28875819
Change-Id: I3f7dc8f3dcac75b4d99814cbc9af67433676a8c7
 2016-05-31 22:43:09 +01:00
Tony Mak
fe0ce01da7 Fix RTL issue in Trusted Credentail page 
Two changes are required to fix the issue.
1. The width of the textview needed to be wrap_content in order
   to resolve the random issue. I guess it is a framework bug, but
   anyway the UI looks the same after the change
2. textAlignment="viewStart" is needed to make the textview RTL
3. Clean up: Change the RelativeLayout to a vertical LinearLayout

Bug: 28757193
Change-Id: I1142d4dd31eb86b80f5a2316c1c7825df287b609
 2016-05-31 19:53:49 +00:00
Jason Monk
a4bc49e55e Fix some top-level settings not updating with language 
They need to be resources so they can load correctly on locale
change.

Change-Id: Iea167b8df411528185987d37704717d9c0b9f254
Fixes: 28861758
 2016-05-31 14:49:03 -04:00
Andrew Sapperstein
15b78d8f19 Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev am: 9ca09c020e 
am: 59358568d0

* commit '59358568d0220dc800cca3ff7633331dfe7e224a':
  Remove the last vestiges of #ff009587.

Change-Id: I3cc323f8b6c98c602f5d934a1d5afb50e82f49d3
 2016-05-31 18:46:26 +00:00
Andrew Sapperstein
59358568d0 Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev 
am: 9ca09c020e

* commit '9ca09c020e561832cd2e4b5abd43c839c461c240':
  Remove the last vestiges of #ff009587.

Change-Id: Iac6ec5047f88b277d313b98c19c4eac4ddce626f
 2016-05-31 18:43:59 +00:00
Andrew Sapperstein
9ca09c020e Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev 2016-05-31 18:38:07 +00:00
Daniel Nishi
b6b9d830d6 Merge "Add an automatic storage management job service." into nyc-mr1-dev am: d7efefa503 
am: f878423e3d

* commit 'f878423e3dd6cebaac5b77a91c95f2e3ae58c125':
  Add an automatic storage management job service.

Change-Id: I63cfc0885b1075e73fbeed65eac8c04eef161851
 2016-05-31 18:33:56 +00:00
Daniel Nishi
f878423e3d Merge "Add an automatic storage management job service." into nyc-mr1-dev 
am: d7efefa503

* commit 'd7efefa503ae408072e45dc6520a4236b8ef40cb':
  Add an automatic storage management job service.

Change-Id: Idd479e72efbe2d62225493c0dfdb7d55ee4f8b20
 2016-05-31 18:31:32 +00:00
Daniel Nishi
d7efefa503 Merge "Add an automatic storage management job service." into nyc-mr1-dev 2016-05-31 18:25:18 +00:00
Bill Yi
603f0b6bb4 Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa56eef3fd -s ours am: d18592cdbb -s ours 
am: db3b1b5307  -s ours

* commit 'db3b1b530765f42632dab224959791b319b9b7b7':

Change-Id: I078520bb6d8353098f835473f119c7e2ea0eb9a6
 2016-05-31 17:16:46 +00:00
Bill Yi
db3b1b5307 Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa56eef3fd -s ours 
am: d18592cdbb  -s ours

* commit 'd18592cdbbf689ae458128c9217b404d1111a7ed':

Change-Id: I04ea249c5e6b6272bceabb6b85c8b7750e19f8a2
 2016-05-31 17:14:11 +00:00
Daniel Nishi
80c204420b Add an automatic storage management job service. 
This service runs once a day when plugged in when the device has
under 15% free space remaining. If the FeatureFactory has a
storage management job, it runs the job to begin to free up space
on the device.

This is a temporary landing place and will be refactored very
quickly out of Settings.

Bug: 28600825

Change-Id: Id2ebb42a333b3b4e3daef4e50cf985fe055b85c7
 2016-05-31 16:50:48 +00:00
Anna Galusza
062539b7a3 Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev am: bab65d9fc4 
am: 92f200b09c

* commit '92f200b09c76ae364c8e1eb9b09a4a012a56a9d8':
  Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740

Change-Id: Ied2a365be78f8495aeb293d6c60cfa2da14f2004
 2016-05-31 16:50:28 +00:00
Anna Galusza
92f200b09c Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev 
am: bab65d9fc4

* commit 'bab65d9fc41836624bf385898ad21ca14d2f72fe':
  Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740

Change-Id: Icb6c321b7382fe3816cde21e9db72b07f7ba0084
 2016-05-31 16:45:39 +00:00
Bill Yi
b36ec866bb Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa56eef3fd -s ours am: 13e25431cd -s ours 
am: 5b21cc1513  -s ours

* commit '5b21cc1513030e5fcdb84e561d54e53e744bea52':
  Import translations. DO NOT MERGE

Change-Id: I44a86e74470c5647fb267e06646cee437f6bcd84
 2016-05-31 16:45:39 +00:00
Bill Yi
5b21cc1513 Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa56eef3fd -s ours 
am: 13e25431cd  -s ours

* commit '13e25431cdd20e05acfa69f26351d86881598619':
  Import translations. DO NOT MERGE

Change-Id: Ibc124314e722d3e5eb327ad65175846ea00220e4
 2016-05-31 16:40:18 +00:00
Anna Galusza
bab65d9fc4 Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev 2016-05-31 16:39:46 +00:00
Bill Yi
13e25431cd Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: aa56eef3fd  -s ours

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

Change-Id: I8d141f7bb06750c09b60084105ec51f6aeb244ad
 2016-05-31 16:36:46 +00:00
Bill Yi
d18592cdbb Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: aa56eef3fd  -s ours

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

Change-Id: Ib86e499fbcaa25922071cdb5fc08eccdeb5ca5f6
 2016-05-31 16:34:43 +00:00
TreeHugger Robot
aa56eef3fd Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 16:22:40 +00:00
Bill Yi
ad8b92aab1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 442628a226 -s ours 
am: 54ce05d3e3  -s ours

* commit '54ce05d3e373e7cc6d5b4b0f6a19de0c9e3c0728':
  Import translations. DO NOT MERGE

Change-Id: I3934eede769644d25a8ba3a74b2cf7d778607418
 2016-05-31 05:07:24 +00:00
Bill Yi
54ce05d3e3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 442628a226  -s ours

* commit '442628a22693286cc1f96e1b1fbd8743f9eedea7':
  Import translations. DO NOT MERGE

Change-Id: I63a36d6c9a94f27f75adfdc84d2920c55fba2f33
 2016-05-31 04:52:04 +00:00
TreeHugger Robot
d95f2a0367 Merge "Import translations. DO NOT MERGE" 2016-05-31 03:54:29 +00:00
TreeHugger Robot
442628a226 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-31 03:54:15 +00:00
Roozbeh Pournader
4c0bfe9eb5 Merge "Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev am: ed922ce20e" into nyc-mr1-dev-plus-aosp 
am: e2bc59b045

* commit 'e2bc59b04533f0c04599aecd21fb092141b33cf6':

Change-Id: I271d5a51f9181e37e99b2b4cb8a0289b8793ad39
 2016-05-31 02:24:43 +00:00
Roozbeh Pournader
b0a27649e9 Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931 am: aacca81c31 
am: 3aaa715332

* commit '3aaa71533267226a4db6594ecc98a7e3c23a7700':

Change-Id: I9aeea74adad98447ef3f2eee2c656eed21ec6ad7
 2016-05-31 02:24:42 +00:00
Android Build Merger (Role)
e2bc59b045 Merge "Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev am: ed922ce20e" into nyc-mr1-dev-plus-aosp 2016-05-31 02:19:50 +00:00
Roozbeh Pournader
c9d869ebab Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev 
am: ed922ce20e

* commit 'ed922ce20e95ac5d441d0489e4702c9a74652f9b':

Change-Id: I8c3f2d29a706f65d406ff23e01e560ec53512707
 2016-05-31 02:19:39 +00:00
Roozbeh Pournader
3aaa715332 Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931 
am: aacca81c31

* commit 'aacca81c314d9f5b677427dfc4c2cadfa194f4fb':

Change-Id: Ic00a466681fac4393990d17fc3eefa24486eb26b
 2016-05-31 02:19:37 +00:00
Roozbeh Pournader
ed922ce20e Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev 2016-05-31 02:07:36 +00:00
Roozbeh Pournader
f297a3da49 Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931 am: c34946b8fb 
am: e784c743d9

* commit 'e784c743d9e255a14030bc006c96433acdb9275c':
  Show only up to two locales in Settings

Change-Id: I9c7c5eaf55bf68aea8f23e28ccf14b622c049bac
 2016-05-31 01:31:58 +00:00