drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
146,842 Commits 1 Branch 0 Tags
Commit Graph

146842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Egberts
2a236a6466 Simplify generics, and make Builder concrete. 
Change-Id: I3e14966527c254d2c15dddefc2ef60cdde30421f
 2014-08-01 11:46:16 +01:00
Vinit Deshpande
38a7170449 Merge "Rename HotspotListener to BssidListener" into lmp-dev 2014-07-30 19:31:16 +00:00
ztenghui
1c4d8b2173 Correct the tag's name in the exceptions 
Change-Id: I9d1499fbcf8adb6bf0c5c0b7a10a8b480a708c09
 2014-07-31 19:42:31 +00:00
Joe Fernandez
8d7c55bd10 am 441e7aa2: am eb4bc851: am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 
* commit '441e7aa23478b8de386efc69d43f889979bc6eee':
  docs: Adding TIF one-pager to TV docs in L-Preview
 2014-07-31 18:43:21 +00:00
Joe Fernandez
441e7aa234 am eb4bc851: am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 
* commit 'eb4bc851aade1090c0a4e1f1e6f7ecd136b4a47a':
  docs: Adding TIF one-pager to TV docs in L-Preview
 2014-07-31 18:40:05 +00:00
Joe Fernandez
eb4bc851aa am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 
* commit '69ed58aced0e884d7758d84067134b04fbcee9c0':
  docs: Adding TIF one-pager to TV docs in L-Preview
 2014-07-31 18:35:02 +00:00
Wonsik Kim
c2b74b73a1 Fix NPE when fused geofence hardware is not available. 
b/16690237

Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4
 2014-07-31 18:24:23 +00:00
Joe Fernandez
a3e521540b am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'ecf76d1cfd2846412270e6361ec8ba4cfccf8bec':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 18:14:04 +00:00
Joe Fernandez
ecf76d1cfd am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'b83127f0cf35a2d95684293818ca25171f6643e1':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 18:09:27 +00:00
Alan Lau
40274ada4a am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit 'b12318be13be00842d124e4391ce5eabce2d5104':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 17:47:03 +00:00
Alan Lau
839ca0d5fa am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '06a8455421978d06597de2abfccabef928d06056':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 17:44:20 +00:00
Andrew Solovay
60e7f54187 am d46bc784: am 81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 
* commit 'd46bc7845c221b84f9b4e570b95f407c7fc6d0e7':
  docs: Revised page to include info about new Publisher API.
 2014-07-30 17:37:06 +00:00
Alan Lau
231a32a132 am c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 
* commit 'c006227265d7ac705ebeef2f7d87104fdb63f32a':
  Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
 2014-07-30 17:37:02 +00:00
Andrew Solovay
d46bc7845c am 81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 
* commit '813642158979aca52b9d3913e52dda877d74a992':
  docs: Revised page to include info about new Publisher API.
 2014-07-30 17:34:20 +00:00
Ricardo Cervera
9ae4c6f874 am b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit 'b6bfa9e45a953b83289ee57da661746deae7a63f':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:49:57 +00:00
Ricardo Cervera
b6bfa9e45a am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit 'a7898781d6182b5c73a0a3899b71162f92582f66':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:46:07 +00:00
Joe Fernandez
b83127f0cf Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 2014-07-30 16:17:51 +00:00
Joe Fernandez
0d568c98c1 docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ 
Change-Id: Ifa8831e1594470ecf65761efea472de79aaf5ece
 2014-07-30 10:10:19 -07:00
Alan Lau
06a8455421 Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
7ab1900a5a Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying"" 
This reverts commit af60e56b39582ea90ccd7601cd06350a50bf6500.

Change-Id: I1aa698608773b9e540457831e11218f371c71268
 2014-07-30 17:35:29 +00:00
Alan Lau
c006227265 Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
273906bb6a Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator"" 
This reverts commit 77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f.

Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
 2014-07-30 17:30:15 +00:00
Vinit Deshpande
ea676a0e51 Rename HotspotListener to BssidListener 
And other usage of term Hotspot. This is to be technically correct
with the name usage, should the API become public later.

This change also fixes few outstanding requests from GScan API.These
include

a. An event with scan results when REPORT_AFTER_EACH_SCAN is set.
b. ScanSettings now takes in number of APs as an argument.
c. Removed single shot scan API (since it is not implemented anyway)

Change-Id: Id160f9f14193a37cce5f3ab8d6ea528344b788a0
 2014-07-30 08:54:41 -07:00
Narayan Kamath
1fa73206e5 Merge "Don't assume languages are 2 letter codes." into lmp-dev 2014-07-29 22:44:51 +00:00
Narayan Kamath
11bfc2261f Don't assume languages are 2 letter codes. 
Also, note that this method never worked. Locale
settings were stored with underscores (like Locale.toString)
but matched against AssetManager.getLocales() which
returned language-tag like output.

bug: 10090157

(cherry picked from commit fd138cd81a689ff46e6ae90e46adcdc53f3c5442)

Change-Id: Ifc81ac902c297387dba8c40aba0656e18af57c86
 2014-08-01 13:32:12 +01:00
Ricardo Cervera
a7898781d6 Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 2014-07-29 22:44:51 +00:00
Alan Lau
b12318be13 Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 2014-07-29 21:36:00 +00:00
Alan Lau
1fa3c9bef2 Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" 
This reverts commit cbeef01cce314e3a3977b042d8ec0744816c0df4.

Change-Id: I170ccb2264941e8a8b090b3bb553970414f0c4eb
 2014-07-30 17:35:20 +00:00
Andrew Solovay
8136421589 Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 2014-07-29 21:36:00 +00:00
Dirk Dougherty
78ad92b48f am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit '4ff57a9aee76bdfe6808ac9c64f2e90bc14a25ae':
  Doc change: add notice for admob sdk upgrade.
 2014-07-29 21:07:53 +00:00
Dirk Dougherty
4ff57a9aee am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit 'fa3d1b2a27448b82ec1aa6f75c95ed17c4f46748':
  Doc change: add notice for admob sdk upgrade.
 2014-07-29 21:03:25 +00:00
Andrew Solovay
d28470e87a docs: Revised page to include info about new Publisher API. 
Also moved the blurb to the "Google Play Distribution" cover page, and
adjusted the TOC accordingly. Per DDoughterty@ 's request, moved the
"Purchase Verification Strategies" section to billing_subscriptions.jd

Page is staged to:

http://asolovay.mtv:9543/google/play/billing/gp-purchase-status-api.html
http://asolovay.mtv:9543/google/play/billing/billing_subscriptions.html#strategies

Change-Id: I884e2f3f25c76fcb055e663058d1a4f4642fb558
 2014-07-29 14:00:03 -07:00
Dirk Dougherty
fa3d1b2a27 Doc change: add notice for admob sdk upgrade. 
Change-Id: I9281b17e4ff277ef99ae57ce0360e05f4231e7ff
 2014-07-29 20:32:17 +00:00
Ricardo Cervera
932ced3a30 docs: Added system requirements for Studio. Bug: 16566355 
Change-Id: I1d3d80ce718d64e01fd939aa177c950d56065555
 2014-07-29 13:24:34 -07:00
Robert Ly
9c53194a6f am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '58967bfbe824f020194872a6d0a5204b54e6043a':
  docs: fix typo bug 16623189
 2014-07-29 16:34:01 +00:00
Robert Ly
58967bfbe8 am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '1c977b3744dbe916edde2e256a39c30e5888ef4f':
  docs: fix typo bug 16623189
 2014-07-29 16:30:07 +00:00
Robert Ly
0029ef6759 am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit 'dadb473e2b9dc7bf2691dea7153c6700102e6562':
  docs: fix typo
 2014-07-29 15:42:24 +00:00
Robert Ly
dadb473e2b am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit '9613b433f47162d008f034afbb16deac16532662':
  docs: fix typo
 2014-07-29 15:38:02 +00:00
Ricardo Cervera
7f214e6149 am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:32:57 +00:00
Ricardo Cervera
8d1aa95729 am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '652e5c7ef1f8176dc680f7c4ba782164269b03b0':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:29:00 +00:00
Ricardo Cervera
5ff390be1b am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit 'df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
  docs: Fix Wear docs issues.
 2014-07-29 15:07:56 +00:00
Ricardo Cervera
df881ccc1f am 321e0302: docs: Fix Wear docs issues. 
* commit '321e030202cb74cad0dd8a4950cffe361a5072c8':
  docs: Fix Wear docs issues.
 2014-07-29 15:01:11 +00:00
Filip Gruszczynski
896a82d77e am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-28 23:40:13 +00:00
Craig Mautner
09875ec729 am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
 2014-07-28 23:28:59 +00:00
Robert Ly
1c977b3744 Merge "docs: fix typo bug 16623189" into klp-modular-docs 2014-07-28 22:45:16 +00:00
Robert Ly
a66de16cde docs: fix typo bug 16623189 
Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799
 2014-07-29 16:26:36 +00:00
Robert Ly
a37ddd97a8 docs: fix typo 
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
 2014-07-29 08:33:17 -07:00
Craig Mautner
0fa45d93f7 Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 2014-07-28 22:45:16 +00:00
Craig Mautner
7f13ed37fd Remove PendingActivityLaunches based on stack. 
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.

Fixes bug 16045752.

Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
 2014-07-28 14:00:35 -07:00
Alan Lau
52baf3d096 am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit '77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:07:23 +00:00