OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "can open settings with support tab by default" into nyc-mr1-dev am: 5bd202e277
Salvador Martinez [Mon, 22 Aug 2016 22:32:25 +0000 (22:32 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev am: 5bd202e277
am: a9dc4d46ca

Change-Id: I9144185ab2a1e47364d6e8720481f3741b70f615

7 years agocan open settings with support tab by default am: 12c5208ad0
Salvador Martinez [Mon, 22 Aug 2016 22:32:20 +0000 (22:32 +0000)]
can open settings with support tab by default am: 12c5208ad0
am: 8d47bdc773

Change-Id: I223e42c2bc89e3f95a0fed9cc74ebfb21932370f

7 years agoMerge "Make number in dialog highlighted" into nyc-mr1-dev am: 2363094863
Lei Yu [Mon, 22 Aug 2016 22:32:19 +0000 (22:32 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev am: 2363094863
am: ffc6372e7d

Change-Id: Ib86849dbdbfd1521c0715f839aba8c2acdc6538b

7 years agoMake number in dialog highlighted am: 7a78213776
jackqdyulei [Mon, 22 Aug 2016 22:32:18 +0000 (22:32 +0000)]
Make number in dialog highlighted am: 7a78213776
am: 226ccfe62f

Change-Id: Ie22cae038131a206f2d8a246ba3cd80398ba7cff

7 years agoMerge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am: dd90acf2c0
Lei Yu [Mon, 22 Aug 2016 22:32:17 +0000 (22:32 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am: dd90acf2c0
am: 69db34ed2e

Change-Id: Ifdb6298262e2c2269e83c815cd376066fb7ec4e9

7 years agoFix the nullpointer bug in monkey test. am: 409c4708c1
jackqdyulei [Mon, 22 Aug 2016 22:32:17 +0000 (22:32 +0000)]
Fix the nullpointer bug in monkey test. am: 409c4708c1
am: fbed8d95e9

Change-Id: Ia93f4051af386b8d6dee02d7c617fe75730e9fc2

7 years agoMerge "can open settings with support tab by default" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 22:20:58 +0000 (22:20 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev
am: 5bd202e277

Change-Id: I0100549be28207d38ac040e8e7cd5fd5c3c1447f

7 years agocan open settings with support tab by default
Salvador Martinez [Mon, 22 Aug 2016 22:20:54 +0000 (22:20 +0000)]
can open settings with support tab by default
am: 12c5208ad0

Change-Id: Ic28fc68db3d971ccf48c5667875474d4c9060a7b

7 years agoMerge "Make number in dialog highlighted" into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 22:20:52 +0000 (22:20 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev
am: 2363094863

Change-Id: Ie93f7f491f2ccc5747963be5ba44e1e9c94fc584

7 years agoMake number in dialog highlighted
jackqdyulei [Mon, 22 Aug 2016 22:20:52 +0000 (22:20 +0000)]
Make number in dialog highlighted
am: 7a78213776

Change-Id: I1b5fb80a2a38a1224d6aa586d1ff2065c4a2a32a

7 years agoMerge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 22:20:51 +0000 (22:20 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
am: dd90acf2c0

Change-Id: I61637865ac2eed318d46e568b61f8eecc03713ab

7 years agoFix the nullpointer bug in monkey test.
jackqdyulei [Mon, 22 Aug 2016 22:20:50 +0000 (22:20 +0000)]
Fix the nullpointer bug in monkey test.
am: 409c4708c1

Change-Id: I03e6e3a5951f587169d0b2758283bff069b925a2

7 years agoMerge "can open settings with support tab by default" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:53:52 +0000 (21:53 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev

7 years agoMerge "Make number in dialog highlighted" into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 21:50:29 +0000 (21:50 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev

7 years agoMerge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 21:49:56 +0000 (21:49 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev

7 years agoMerge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1...
Fan Zhang [Mon, 22 Aug 2016 21:43:23 +0000 (21:43 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev am: 45fd5c4d4e
am: a5785b72bb

Change-Id: Id7383a0e5565e5b1d8544553c6fdc10d75de26cf

7 years agoSet oem unlock switch to reflect the actual state of device am: 1ba24ca792
Fan Zhang [Mon, 22 Aug 2016 21:43:22 +0000 (21:43 +0000)]
Set oem unlock switch to reflect the actual state of device am: 1ba24ca792
am: ede4f9d41f

Change-Id: I61f6cc2ec3dc40f27dc1ac943a2305c41a826a88

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b98e47c79b -s ours
Bill Yi [Mon, 22 Aug 2016 21:43:19 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b98e47c79b  -s ours
am: 0d15b016db  -s ours

Change-Id: I0e8a0a446a27c6b1e946829a9f6b895548bdc72f

7 years agoImport translations. DO NOT MERGE am: f58be49ba8 -s ours
Bill Yi [Mon, 22 Aug 2016 21:42:11 +0000 (21:42 +0000)]
Import translations. DO NOT MERGE am: f58be49ba8  -s ours
am: 4114547feb  -s ours

Change-Id: Icac1aca6c6f4d09de537b606b42ae1bb1c2ce457

7 years agoMerge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev...
Fan Zhang [Mon, 22 Aug 2016 21:42:10 +0000 (21:42 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev am: 5a6fad7607
am: 93c6887768

Change-Id: If1fd73e98e2f06278e71d282a55d036215e7c50b

7 years agoHave a fallback package name when matching targetPackage. am: 0c58131c37
Fan Zhang [Mon, 22 Aug 2016 21:42:09 +0000 (21:42 +0000)]
Have a fallback package name when matching targetPackage. am: 0c58131c37
am: 2dd0275d66

Change-Id: I4ecd52a133db924a47fcaf843a32c64227134fd8

7 years agoMerge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev...
Fan Zhang [Mon, 22 Aug 2016 21:42:09 +0000 (21:42 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev am: ce8a222a59
am: 562d8276a6

Change-Id: Ie6ec75ea45b9bb94652ce649ce1e7bdf68b74135

7 years agoAlign text to view start so they layout correctly in RTL. am: be56fc17ed
Fan Zhang [Mon, 22 Aug 2016 21:42:07 +0000 (21:42 +0000)]
Align text to view start so they layout correctly in RTL. am: be56fc17ed
am: eebdb575ba

Change-Id: Ie72f4716ae0fe55b7f3fffb7f100031f5122add7

7 years agoMerge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 21:37:49 +0000 (21:37 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev
am: 45fd5c4d4e

Change-Id: I6ea35fe7eb8b6b8d711b128ada6da50284896a40

7 years agoSet oem unlock switch to reflect the actual state of device
Fan Zhang [Mon, 22 Aug 2016 21:37:48 +0000 (21:37 +0000)]
Set oem unlock switch to reflect the actual state of device
am: 1ba24ca792

Change-Id: I77c374d43d6f78cf57cf2a1a9bb505538d86c9aa

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Mon, 22 Aug 2016 21:37:47 +0000 (21:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: b98e47c79b  -s ours

Change-Id: I5b2018c5885abc17a04d5e5a1bae92178cd9e854

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 22 Aug 2016 21:37:45 +0000 (21:37 +0000)]
Import translations. DO NOT MERGE
am: f58be49ba8  -s ours

Change-Id: Ia9c43520ca258a2b85c47c417016f689723935ee

7 years agoMerge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 21:37:44 +0000 (21:37 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev
am: 5a6fad7607

Change-Id: I227c1571ba527529af038bf805c15f8b0bc803a4

7 years agoHave a fallback package name when matching targetPackage.
Fan Zhang [Mon, 22 Aug 2016 21:37:43 +0000 (21:37 +0000)]
Have a fallback package name when matching targetPackage.
am: 0c58131c37

Change-Id: I0c57b1a71c6388a3fdfc761b44b142abfdf40bcb

7 years agoMerge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 21:37:42 +0000 (21:37 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev
am: ce8a222a59

Change-Id: I2c8356156df5a938add968561efccdcc3affe72e

7 years agoAlign text to view start so they layout correctly in RTL.
Fan Zhang [Mon, 22 Aug 2016 21:37:41 +0000 (21:37 +0000)]
Align text to view start so they layout correctly in RTL.
am: be56fc17ed

Change-Id: I079df4d68672d97b4bb30996fb58c5a951e513f1

7 years agoMerge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev
TreeHugger Robot [Mon, 22 Aug 2016 21:32:44 +0000 (21:32 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 22 Aug 2016 21:28:29 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev
TreeHugger Robot [Mon, 22 Aug 2016 21:23:47 +0000 (21:23 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev

7 years agoMerge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev
TreeHugger Robot [Mon, 22 Aug 2016 21:17:20 +0000 (21:17 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev

7 years agoMerge "When click conditional's title, expand/collapse content." into nyc-mr1-dev...
Fan Zhang [Mon, 22 Aug 2016 20:18:30 +0000 (20:18 +0000)]
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev am: 95c097e835
am: 06b7346a8b

Change-Id: I86b64a4394412567a14e3cdfdc8bc9b723f1146c

7 years agoWhen click conditional's title, expand/collapse content. am: 89d7bca166
Fan Zhang [Mon, 22 Aug 2016 20:18:29 +0000 (20:18 +0000)]
When click conditional's title, expand/collapse content. am: 89d7bca166
am: c8b20343f0

Change-Id: I416b3f87bc3d5bde0396dd5ddf6cb23c43b3d155

7 years agoMerge "When click conditional's title, expand/collapse content." into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 20:17:01 +0000 (20:17 +0000)]
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev
am: 95c097e835

Change-Id: I0449a66cb1ae894c6fdb8e478325ba222f84ff8d

7 years agoWhen click conditional's title, expand/collapse content.
Fan Zhang [Mon, 22 Aug 2016 20:16:59 +0000 (20:16 +0000)]
When click conditional's title, expand/collapse content.
am: 89d7bca166

Change-Id: I7ee56f661cba9e9d79399b8f01fc05cf5a70b27a

7 years agoHide default phone preference when there is no phone app. am: dc1e04035b
Fan Zhang [Mon, 22 Aug 2016 20:06:26 +0000 (20:06 +0000)]
Hide default phone preference when there is no phone app. am: dc1e04035b
am: 0ae351771e

Change-Id: I8751c22c53b66b69f1a8a4d20f4997bb40316764

7 years agoHide default phone preference when there is no phone app.
Fan Zhang [Mon, 22 Aug 2016 20:05:30 +0000 (20:05 +0000)]
Hide default phone preference when there is no phone app.
am: dc1e04035b

Change-Id: I2b588c9a31f405f66c1603aacbe67798ac637dee

7 years agoMerge "When click conditional's title, expand/collapse content." into nyc-mr1-dev
TreeHugger Robot [Mon, 22 Aug 2016 20:01:16 +0000 (20:01 +0000)]
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 22 Aug 2016 19:57:11 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic0668c1bf03195d38aabb92176ae6ff6d6f079d2
Auto-generated-cl: translation import

7 years agoSet oem unlock switch to reflect the actual state of device
Fan Zhang [Wed, 10 Aug 2016 17:08:35 +0000 (10:08 -0700)]
Set oem unlock switch to reflect the actual state of device

Bug: 30772025
Change-Id: I143ceafb36f2f2091683b29d02ee64c07e44bb15
(cherry picked from commit e98178bd58667b6ad756bf8a214547502185d66f)

7 years agoAlign text to view start so they layout correctly in RTL.
Fan Zhang [Thu, 11 Aug 2016 22:04:15 +0000 (15:04 -0700)]
Align text to view start so they layout correctly in RTL.

Bug: 28011099
Change-Id: I65b7ab768c384a558f89e3bce539420454fed8a5
(cherry picked from commit 794de426da27b7d9bf4d93b0533d9e0ff16dc105)

7 years agoHave a fallback package name when matching targetPackage.
Fan Zhang [Fri, 12 Aug 2016 01:37:35 +0000 (18:37 -0700)]
Have a fallback package name when matching targetPackage.

Bug: 29774397

When figuring out best match package name, we should have a fallback.
Otherwise sometimes we get empty package names, causing problems when
trying to display memory usage for each app.

Change-Id: I9cc4205098bb7c727a3063b2275fb464c8153097
(cherry picked from commit d5ff4c42924d11c32ab591f5cef00694ce035e15)

7 years agoWhen click conditional's title, expand/collapse content.
Fan Zhang [Thu, 11 Aug 2016 23:41:29 +0000 (16:41 -0700)]
When click conditional's title, expand/collapse content.

Bug: 30200101

It used to lead user to detailed setting for that conditional. This
leaves some confusion about which click target goes to where.

Change-Id: Ic9525ace65ca488f4e709576fb1ec96a1cb99938
(cherry picked from commit a2db2ca8fad50f0fb4cdd060d83c746a857fe92a)

7 years agoHide default phone preference when there is no phone app.
Fan Zhang [Mon, 15 Aug 2016 19:32:20 +0000 (12:32 -0700)]
Hide default phone preference when there is no phone app.

Bug: 29859821
Change-Id: Ia6de0de04d74f4f947243f38ac2bd190ae586401
(cherry picked from commit bc6fc60683082dea6e91872e029787a0039e4cb5)

7 years agoDO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable...
Meng Wang [Mon, 22 Aug 2016 05:01:27 +0000 (05:01 +0000)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable am: 5ea4bb2f43  -s ours am: a928b294d9  -s ours
am: 715564af48  -s ours

Change-Id: If0db222e5aff9c40dde2adf008d9ca56d3711dc7

7 years agoDO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable...
Meng Wang [Mon, 22 Aug 2016 04:59:13 +0000 (04:59 +0000)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable am: 5ea4bb2f43  -s ours
am: a928b294d9  -s ours

Change-Id: If964580319c45956d10626b57a6e769665bb75dd

7 years agoDO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
Meng Wang [Mon, 22 Aug 2016 04:46:46 +0000 (04:46 +0000)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
am: 5ea4bb2f43  -s ours

Change-Id: Iba62c6b007ad0d68d528047896dfd88961a953cd

7 years agoDO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
Meng Wang [Thu, 18 Aug 2016 19:19:01 +0000 (12:19 -0700)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable

Bug: 30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
(cherry picked from commit 4436d6fe16c3a685b839358006183d1e8d304a33)

7 years agoMerge "Fixed storage calculation when SD card is adopted as internal storage." into...
Felipe Leme [Fri, 19 Aug 2016 23:25:20 +0000 (23:25 +0000)]
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev am: 4fd371d344
am: d4fb981f73

Change-Id: I749aa6a5eaf2fdef194a3f626f9f884071186368

7 years agoFixed storage calculation when SD card is adopted as internal storage. am: 454d7fcca8
Felipe Leme [Fri, 19 Aug 2016 23:25:19 +0000 (23:25 +0000)]
Fixed storage calculation when SD card is adopted as internal storage. am: 454d7fcca8
am: 15ebe1fcc3

Change-Id: I67c38af3e0759501cf71e431375417388b9a2474

7 years agoMerge "Changing the languages drag handle as per the Material Design spec" into nyc...
Roozbeh Pournader [Fri, 19 Aug 2016 23:25:18 +0000 (23:25 +0000)]
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev am: a87fa8c50a
am: d6c91cbf16

Change-Id: I0f0197f2da5ad0c8e2e07b2fa0f7b2fee0f13416

7 years agoChanging the languages drag handle as per the Material Design spec am: 30cf5f2615
Mihai Nita [Fri, 19 Aug 2016 23:25:18 +0000 (23:25 +0000)]
Changing the languages drag handle as per the Material Design spec am: 30cf5f2615
am: 188ab9120e

Change-Id: Ic0024715605c79935bd175a89c84cd53ad602c7d

7 years agoMerge "Fixed storage calculation when SD card is adopted as internal storage." into...
Felipe Leme [Fri, 19 Aug 2016 23:04:03 +0000 (23:04 +0000)]
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev
am: 4fd371d344

Change-Id: Id95a997997b97006367c7180ca26cafb15435f42

7 years agoFixed storage calculation when SD card is adopted as internal storage.
Felipe Leme [Fri, 19 Aug 2016 23:04:03 +0000 (23:04 +0000)]
Fixed storage calculation when SD card is adopted as internal storage.
am: 454d7fcca8

Change-Id: I4fa4a4c489b3f65c6aab2f012d0898442dda4c2a

7 years agoMerge "Fixed storage calculation when SD card is adopted as internal storage." into...
TreeHugger Robot [Fri, 19 Aug 2016 22:40:08 +0000 (22:40 +0000)]
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev

7 years agoMerge "Changing the languages drag handle as per the Material Design spec" into nyc...
Roozbeh Pournader [Fri, 19 Aug 2016 22:33:41 +0000 (22:33 +0000)]
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev
am: a87fa8c50a

Change-Id: I21b1f122846b2c89d0df2d0bf0c74ce744ab5931

7 years agoChanging the languages drag handle as per the Material Design spec
Mihai Nita [Fri, 19 Aug 2016 22:33:40 +0000 (22:33 +0000)]
Changing the languages drag handle as per the Material Design spec
am: 30cf5f2615

Change-Id: I2db85b361af48cc206bef0c958561d81369bdd35

7 years agoMerge "Changing the languages drag handle as per the Material Design spec" into nyc...
Roozbeh Pournader [Fri, 19 Aug 2016 21:36:32 +0000 (21:36 +0000)]
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev

7 years agoExtend conditional button width so it has more click area. am: e90777710c
Fan Zhang [Fri, 19 Aug 2016 20:02:23 +0000 (20:02 +0000)]
Extend conditional button width so it has more click area. am: e90777710c
am: 0b17ff28d9

Change-Id: I6c592e623f22090852b78efa75b3579b57003787

7 years agoExtend conditional button width so it has more click area.
Fan Zhang [Fri, 19 Aug 2016 19:58:49 +0000 (19:58 +0000)]
Extend conditional button width so it has more click area.
am: e90777710c

Change-Id: I1e8575bc3ffb2ce155877ad91251d1c0239dd216

7 years agoMake number in dialog highlighted
jackqdyulei [Thu, 11 Aug 2016 21:44:53 +0000 (14:44 -0700)]
Make number in dialog highlighted

Bug: 28787910

Change-Id: Idf6767156c0a3dafffb62b9a41ee81f6a9712a2f
(cherry picked from commit c54973b8d838b97f508fd519444d954fdb30dd4f)

7 years agoFix the nullpointer bug in monkey test.
jackqdyulei [Thu, 11 Aug 2016 18:12:20 +0000 (11:12 -0700)]
Fix the nullpointer bug in monkey test.

Bug: 30632031

Change-Id: I295bcc804a5e847f99577353c888caa08dc8c7ef
(cherry picked from commit a2938d2a2ff29d003b5a984e9983d854330182ef)

7 years agocan open settings with support tab by default
Salvador Martinez [Tue, 26 Jul 2016 01:16:47 +0000 (18:16 -0700)]
can open settings with support tab by default

Changes were made to the two files to allow users to provide
an argument in the intent for the settings activity. This
argument allows you to specify if you want the summary tab
or support open on startup.

Fixes: 30233920
Change-Id: I4745a0f75ea6a60a22381f5e58f2fac3836d86b9
(cherry picked from commit 2368e548e69e7331a0ea9b579cc65dd4b73b1343)

7 years agoExtend conditional button width so it has more click area.
Fan Zhang [Tue, 16 Aug 2016 01:31:55 +0000 (18:31 -0700)]
Extend conditional button width so it has more click area.

Bug: 30822058
Change-Id: I88a88c7807309741113e4b5557686c08261eb5d0
(cherry picked from commit 40b56b4c15f3b5e6984902d0fe267494dbe8ead2)

7 years agoImport translations. DO NOT MERGE am: 1339fe799d -s ours
Bill Yi [Fri, 19 Aug 2016 16:14:34 +0000 (16:14 +0000)]
Import translations. DO NOT MERGE am: 1339fe799d  -s ours
am: 925c2bbcf6  -s ours

Change-Id: Id51ff59548ef9acd70ced2ad681f0b42524f53ac

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 19 Aug 2016 16:11:07 +0000 (16:11 +0000)]
Import translations. DO NOT MERGE
am: 1339fe799d  -s ours

Change-Id: Ide032ff6bbdfdb0f73e045135f80a3d1f75f338e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 19 Aug 2016 14:39:53 +0000 (07:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0efafca736424685e687ac6f08884fdc5e69e88d
Auto-generated-cl: translation import

7 years agoMerge "Do not allow apps to cause Bluetooth to be discoverable forever" am: 692ad7c9e...
Ajay Panicker [Thu, 18 Aug 2016 22:33:21 +0000 (22:33 +0000)]
Merge "Do not allow apps to cause Bluetooth to be discoverable forever" am: 692ad7c9ec am: 717d9f205a
am: 0493302a06

Change-Id: Ib82a2ed83b783816ad2305d51f3ec823c6d83926

7 years agoMerge "Do not allow apps to cause Bluetooth to be discoverable forever" am: 692ad7c9ec
Ajay Panicker [Thu, 18 Aug 2016 22:30:51 +0000 (22:30 +0000)]
Merge "Do not allow apps to cause Bluetooth to be discoverable forever" am: 692ad7c9ec
am: 717d9f205a

Change-Id: I1c4f627f6792109db1fec087855962bf4f635b7c

7 years agoMerge "Do not allow apps to cause Bluetooth to be discoverable forever"
Ajay Panicker [Thu, 18 Aug 2016 22:27:24 +0000 (22:27 +0000)]
Merge "Do not allow apps to cause Bluetooth to be discoverable forever"
am: 692ad7c9ec

Change-Id: I60f576fee6222d0917ce845dd0bc071817d26009

7 years agoMerge "Do not allow apps to cause Bluetooth to be discoverable forever"
Treehugger Robot [Thu, 18 Aug 2016 22:23:05 +0000 (22:23 +0000)]
Merge "Do not allow apps to cause Bluetooth to be discoverable forever"

7 years agoMerge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1...
Meng Wang [Thu, 18 Aug 2016 22:11:37 +0000 (22:11 +0000)]
Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev am: f30ef19dc3
am: 7f26e8407c

Change-Id: I04e9482f719bd0a0d66fffa918b5e0be7d1029d4

7 years agoWiFiCallingSettings: hide wfc mode preference if not editable am: 4436d6fe16
Meng Wang [Thu, 18 Aug 2016 22:11:37 +0000 (22:11 +0000)]
WiFiCallingSettings: hide wfc mode preference if not editable am: 4436d6fe16
am: f1788b502e

Change-Id: I67bb75cf7b453d9ca7e5a6a47dc16fbf074fa747

7 years agoMerge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev
Meng Wang [Thu, 18 Aug 2016 22:08:27 +0000 (22:08 +0000)]
Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev
am: f30ef19dc3

Change-Id: Ibe2e2a5a6d5188ae4aa42195884caa5b0ad7853b

7 years agoWiFiCallingSettings: hide wfc mode preference if not editable
Meng Wang [Thu, 18 Aug 2016 22:08:27 +0000 (22:08 +0000)]
WiFiCallingSettings: hide wfc mode preference if not editable
am: 4436d6fe16

Change-Id: Ica966b8306afd541521b0e7f65c68019f4c692b4

7 years agoDo not allow apps to cause Bluetooth to be discoverable forever am: 6dcab67c0c
Ajay Panicker [Thu, 18 Aug 2016 22:01:26 +0000 (22:01 +0000)]
Do not allow apps to cause Bluetooth to be discoverable forever am: 6dcab67c0c
am: 091986f33a

Change-Id: I2231d4bb2d339bbcf4a248e1702c3efae82c544d

7 years agoMerge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev
TreeHugger Robot [Thu, 18 Aug 2016 21:59:16 +0000 (21:59 +0000)]
Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev

7 years agoDo not allow apps to cause Bluetooth to be discoverable forever
Ajay Panicker [Thu, 18 Aug 2016 21:57:51 +0000 (21:57 +0000)]
Do not allow apps to cause Bluetooth to be discoverable forever
am: 6dcab67c0c

Change-Id: Ifaef229a60b74bb2708159232fe8f6792ded7647

7 years agoDo not allow apps to cause Bluetooth to be discoverable forever
Ajay Panicker [Thu, 18 Aug 2016 20:17:19 +0000 (13:17 -0700)]
Do not allow apps to cause Bluetooth to be discoverable forever

Trying to set a discoverable timout of 0 for Bluetooth will now
not allow bluetooth to be discoverable forever.

Bug: 28177801
Change-Id: Icfa03e2100f8e7f31415ebab39889b9ec32e6c77
(cherry picked from commit 6dcab67c0ccf5d9a644059260a16f46a07043eee)

7 years agoDo not allow apps to cause Bluetooth to be discoverable forever
Ajay Panicker [Thu, 18 Aug 2016 20:17:19 +0000 (13:17 -0700)]
Do not allow apps to cause Bluetooth to be discoverable forever

Trying to set a discoverable timout of 0 for Bluetooth will now
not allow bluetooth to be discoverable forever.

Bug: 28177801
Change-Id: Icfa03e2100f8e7f31415ebab39889b9ec32e6c77

7 years agoWiFiCallingSettings: hide wfc mode preference if not editable
Meng Wang [Thu, 18 Aug 2016 19:19:01 +0000 (12:19 -0700)]
WiFiCallingSettings: hide wfc mode preference if not editable

Bug: 30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9

7 years agoMerge "Display days of week in locale order." into nyc-mr1-dev am: 8d9ade8b9c
Julia Reynolds [Wed, 17 Aug 2016 19:04:35 +0000 (19:04 +0000)]
Merge "Display days of week in locale order." into nyc-mr1-dev am: 8d9ade8b9c
am: fcc323c091

Change-Id: I680adb75a621a0641a2262199a86ad7693ce9566

7 years agoDisplay days of week in locale order. am: 0bb60ada96
Julia Reynolds [Wed, 17 Aug 2016 19:04:35 +0000 (19:04 +0000)]
Display days of week in locale order. am: 0bb60ada96
am: c3997cbae1

Change-Id: Ic8837b2b5c1985910a02edf62316597bdff87122

7 years agoLoad default data warning value instead of hardcode it. am: 688ad857e8
Fan Zhang [Wed, 17 Aug 2016 18:31:20 +0000 (18:31 +0000)]
Load default data warning value instead of hardcode it. am: 688ad857e8
am: 2ef1750fff

Change-Id: I1b33b9e40e0daf6b489a0662f7b14631b6899d7b

7 years agoImport translations. DO NOT MERGE am: 8a611b1162 -s ours
Bill Yi [Wed, 17 Aug 2016 18:31:16 +0000 (18:31 +0000)]
Import translations. DO NOT MERGE am: 8a611b1162  -s ours
am: 25a04c0b39  -s ours

Change-Id: I51f6a1fe06709f31cb51d99e5deeb7ebcb3b91cc

7 years agoMerge "Display days of week in locale order." into nyc-mr1-dev
Julia Reynolds [Wed, 17 Aug 2016 18:11:44 +0000 (18:11 +0000)]
Merge "Display days of week in locale order." into nyc-mr1-dev
am: 8d9ade8b9c

Change-Id: I2fc4c10d0fae744749a7c92aa0c39681e1c9861c

7 years agoDisplay days of week in locale order.
Julia Reynolds [Wed, 17 Aug 2016 18:11:43 +0000 (18:11 +0000)]
Display days of week in locale order.
am: 0bb60ada96

Change-Id: I9c6cb0b0947d8d313fa5794185fbe119cfa7725a

7 years agoLoad default data warning value instead of hardcode it.
Fan Zhang [Wed, 17 Aug 2016 17:39:24 +0000 (17:39 +0000)]
Load default data warning value instead of hardcode it.
am: 688ad857e8

Change-Id: Ie982559572c96da6ba0bb9276f4ba974936b418f

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 17 Aug 2016 17:39:22 +0000 (17:39 +0000)]
Import translations. DO NOT MERGE
am: 8a611b1162  -s ours

Change-Id: I69399deba5bc5fd85d06923cacc07fb1128f6eec

7 years agoMerge "Display days of week in locale order." into nyc-mr1-dev
Julia Reynolds [Wed, 17 Aug 2016 16:42:25 +0000 (16:42 +0000)]
Merge "Display days of week in locale order." into nyc-mr1-dev

7 years agoLoad default data warning value instead of hardcode it.
Fan Zhang [Tue, 9 Aug 2016 23:27:54 +0000 (16:27 -0700)]
Load default data warning value instead of hardcode it.

Bug: 30898071
Change-Id: I36f3669ca07862476c778aabb1290f3ceb3afc92

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Aug 2016 09:31:55 +0000 (02:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib98e5307dd77c0295e16e465c0f12d362749ea4b
Auto-generated-cl: translation import

7 years agoDon't dial any number if DIAL intent is not supported. am: 6098913d4b
Fan Zhang [Mon, 15 Aug 2016 23:44:32 +0000 (23:44 +0000)]
Don't dial any number if DIAL intent is not supported. am: 6098913d4b
am: 9d478bef16

Change-Id: I6726f4551a1ca865c225d2c6d2bfb0b1e6a4f00a

7 years agoDon't dial any number if DIAL intent is not supported.
Fan Zhang [Mon, 15 Aug 2016 23:40:39 +0000 (23:40 +0000)]
Don't dial any number if DIAL intent is not supported.
am: 6098913d4b

Change-Id: Ia00c08773bb69508f274739043b6c0b00015358e

7 years agoFixed storage calculation when SD card is adopted as internal storage.
Felipe Leme [Mon, 8 Aug 2016 18:04:30 +0000 (11:04 -0700)]
Fixed storage calculation when SD card is adopted as internal storage.

A SD Card can be set as internal storage, in which case its total must
be added to the total internal storage size.

Prior to this change, the total internal storage size was hardcoded as
the value returned by Storage Manager.

Also fixed the storage summary total to exclude portable devices.

** Cherrypick of c53410c41148a3882673ba1a3d95dd050649ea2a **

Fixes: 30689428
BUG: 30742322

Change-Id: I1e33038eeebc91f3c525a387a97987391c10f2f9

7 years agoDon't dial any number if DIAL intent is not supported.
Fan Zhang [Mon, 15 Aug 2016 20:22:42 +0000 (13:22 -0700)]
Don't dial any number if DIAL intent is not supported.

Bug: 30868123
Change-Id: Ieb971fdd86011ef0699fdbcfec1ecce2112d0209