Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Jensen
fc8022f8cf Show broken lock image when SSL errors are encountered in CaptivePortalLogin. 
The WebView cancels the page load by default, so showing an indicative image
at least informs users that there is a security problem.

bug:18505835
bug:18570703
Change-Id: Ie6dd9294eec9ca25d27e95a1cd2c95e3065de469
 2014-12-10 14:33:34 +00:00
Geoff Mendal
2a5f0b4e3b am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'b7180c450e8364077f37f792160c94941d8839c6':
  Import translations. DO NOT MERGE
 2014-12-10 14:33:06 +00:00
Jason Monk
9309db894d am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev 
* commit '28fffd58a1e9eea2e84c15b124cbfde1c8dbb2c8':
  CarrierText clear itself when no mob. data support
 2014-12-10 14:33:00 +00:00
Geoff Mendal
f6e388231d Import translations. DO NOT MERGE 
Change-Id: I76e8da5cbb1d3c5e39ea80ebdc0f4f9b129febf7
Auto-generated-cl: translation import
 2014-12-10 06:31:09 -08:00
Geoff Mendal
b7180c450e Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-10 14:30:40 +00:00
Geoff Mendal
aa72294174 Import translations. DO NOT MERGE 
Change-Id: I63ccbdea01d869627116121f95c9d35cd64da04e
Auto-generated-cl: translation import
 2014-12-10 06:26:53 -08:00
Jason Monk
28fffd58a1 Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev 2014-12-10 14:25:39 +00:00
Narayan Kamath
c46f75ef1d Avoid tearing down process groups twice. 
The second removal always triggers a warning.

Change-Id: Ieafa8374dbffdaff0d576de004a688cae6f8ac18
 2014-12-10 10:01:44 +00:00
Erik Kline
56d2e8fb7b am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 
* commit '33cd463bbbbe47010ed44815fbfd0ab5e8fbf825':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
 2014-12-10 07:36:35 +00:00
Erik Kline
33cd463bbb Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 2014-12-10 07:29:47 +00:00
Ricardo Cervera
e4afef448d am 7cc203d7: am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '7cc203d73418316628818883ea66ad8f1eebaf45':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 06:05:54 +00:00
Joe Fernandez
39409f28e6 am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '17cf77898af530dc8672e74b32ed4a210e951cef':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 06:05:49 +00:00
Ricardo Cervera
7cc203d734 am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit 'f49c37e723b2f1b4f03cce0b205feb84e9c18648':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:57:22 +00:00
Joe Fernandez
17cf77898a am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '5ff0805238787f938bf5bcadba46ac8f92e8d440':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:57:19 +00:00
Ricardo Cervera
a41a241f6e am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit 'd56b7a39e1be1bec10032c256a28ba88b693cb0e':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:53:36 +00:00
Ricardo Cervera
7061697bfd am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
* commit '2a34e71947e9009672a9df180aad9658fa03dc10':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:53:31 +00:00
Ricardo Cervera
f49c37e723 am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '933005e9e2912a5695ae8b1eeadcb77b05309d2d':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:49:52 +00:00
Joe Fernandez
5ff0805238 am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit 'dfd05f0a867a4c5f6d940aa41a11c034fb7934ab':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:49:49 +00:00
Ricardo Cervera
d56b7a39e1 am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit '504e213fd514f7210eaa95df48620c26c0382487':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:46:39 +00:00
Ricardo Cervera
2a34e71947 am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
* commit 'c0d08616f2280d7c7359bf27e33c0c012a906803':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:46:34 +00:00
Ricardo Cervera
933005e9e2 am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '900efcc91c980a0b30fc1d3017e33e30198b8eb8':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:43:00 +00:00
Ricardo Cervera
1b46c2ccb7 am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit '0342d70e4ee97bbb4e7d21826786065beb13f0fe':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:42:57 +00:00
Joe Fernandez
dfd05f0a86 am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '1832978cf6355515016139e453ced187f4b4e29d':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:42:56 +00:00
Ricardo Cervera
504e213fd5 am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit 'ea15366ae304844756ebdd3d0464b8f9f8d9ce9f':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:39:40 +00:00
Ricardo Cervera
c0d08616f2 am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
* commit 'c6361d8df220200419b679ac573c06a86b5fd1ef':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:39:36 +00:00
Ricardo Cervera
900efcc91c docs: Add details to Packaging Wearable apps. 
Bug: 17943949

(cherry picked from commit 07c9c63e3d)

Change-Id: I765285b7e1a17928778ac161c73b2e48b82b54d6
 2014-12-10 05:36:09 +00:00
Joe Fernandez
1832978cf6 Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 2014-12-10 05:35:22 +00:00
Ricardo Cervera
0342d70e4e am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit 'f94ee2c10ce168f6eef39cc25dd663bb8b79eac9':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:34:57 +00:00
Ricardo Cervera
ea15366ae3 am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit '26e2105575939918e362f14b854176bc54e39b44':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:34:39 +00:00
Ricardo Cervera
c6361d8df2 Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 2014-12-10 05:32:19 +00:00
Ricardo Cervera
26e2105575 Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 2014-12-10 05:28:33 +00:00
Ricardo Cervera
f94ee2c10c am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit 'ec656c51eec62b8b6a8599675add07762f0587cd':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:28:04 +00:00
Ricardo Cervera
7db2979684 docs: Creating Custom Watch Faces training class. 
Bug: 18338418
Bug: 18533881

Change-Id: I71d38c73b6a76c9bec8b646967a93d60b05c639b
 2014-12-09 21:26:58 -08:00
Patrick Tjin
6aa6733cf8 am e3703050: Add recovery kmsg to dropbox 
* commit 'e37030505ee3d461508611e1a291aff7b9e82a43':
  Add recovery kmsg to dropbox
 2014-12-10 05:23:50 +00:00
Ricardo Cervera
ec656c51ee am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit '0024f12dec948d25738c28175ac26d9829b6cd7b':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:21:30 +00:00
Patrick Tjin
e37030505e Add recovery kmsg to dropbox 
Bug: 18642766

Change-Id: I10e4532904a3a8cac43bec7630b9a7a90c2424ba
Signed-off-by: Patrick Tjin <pattjin@google.com>
 2014-12-10 05:16:33 +00:00
Ricardo Cervera
0024f12dec Merge "docs: Design guidelines for watch faces draft." into lmp-docs 2014-12-10 05:12:50 +00:00
Dianne Hackborn
80b1c5608e Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#... 
...testCallActivityOnNewIntent test fails with LMP-MR1 Release.

Check for null.

Also fix some small issues with converting intents to/from intents.

Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14
 2014-12-09 20:22:08 -08:00
smain@google.com
6c1facdc40 am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." int 
* commit '5a267e72b2e26bd55fa7e7123587e9987dc6415a':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
 2014-12-10 03:59:23 +00:00
Joe Fernandez
caad620d04 am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 
* commit '913a683de9ca6dfeca5b57ad7506add98b3a624c':
  docs: Add Distributing to Android Wear doc
 2014-12-10 03:59:18 +00:00
Ricardo Cervera
768d97d0b6 am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs 
* commit '600224c958e26575975a91b45612bdb4783ba03c':
  docs: Add new classes to Wearable UI library
 2014-12-10 03:59:12 +00:00
Ricardo Cervera
739d0a8c6b am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
* commit '45ea56904a4c3698be6823ae278108056f3caae4':
  docs: Add links to wearable support zip for ADT
 2014-12-10 03:59:05 +00:00
Quddus Chong
20baf9e47e am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 
* commit '15e0f7fdb3ffab4adad87bee0a3d987e892cf0bc':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 03:58:59 +00:00
smain@google.com
5a267e72b2 am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs 
* commit '5b16e21b9f1b750d66060a25fadfe35c3ebfed30':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
 2014-12-10 03:53:26 +00:00
Joe Fernandez
913a683de9 am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 
* commit 'f8527c7f82d1197a7ebaf9caf1a199165b47e353':
  docs: Add Distributing to Android Wear doc
 2014-12-10 03:53:22 +00:00
Ricardo Cervera
600224c958 am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs 
* commit '730a52d0cc9c8644791b68530520460860719d1a':
  docs: Add new classes to Wearable UI library
 2014-12-10 03:53:18 +00:00
Ricardo Cervera
45ea56904a am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
* commit '5edaf136c8c3b45dded99e69fad2b5f2fb3a57f2':
  docs: Add links to wearable support zip for ADT
 2014-12-10 03:53:14 +00:00
Quddus Chong
15e0f7fdb3 am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 
* commit 'bdb327adb3faf3604becfe0174ef90ca6ff458c2':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 03:53:08 +00:00
smain@google.com
5b16e21b9f am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs 
* commit '6554bb45eab54061e72f3f3414e40cf4f8e62097':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
 2014-12-10 03:43:07 +00:00
Joe Fernandez
f8527c7f82 am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 
* commit 'c3ae259639d79bfec2d6e50d5fff6b2ced353549':
  docs: Add Distributing to Android Wear doc
 2014-12-10 03:38:05 +00:00