Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,140 Commits 3 Branches 0 Tags
40274ada4a8699a18836c369ca26ebb837ca37f2
Commit Graph

33692 Commits

Author SHA1 Message Date
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
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
Alan Lau
273906bb6a Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator"" 
This reverts commit 77d6f36bbc.

Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
 2014-07-30 17:30:15 +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 cbeef01cce.

Change-Id: I170ccb2264941e8a8b090b3bb553970414f0c4eb
 2014-07-30 17:35:20 +00: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
Alan Lau
d2e1ecb67b am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit '40b0d4d7519b6a1999742534513406f94c169f1f':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 19:58:00 +00:00
Alan Lau
77d6f36bbc Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
This reverts commit 0c87dfd25d.

Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
 2014-07-28 19:53:51 +00:00
Alan Lau
cbeef01cce Revert "DO NOT MERGE Fix line breaking for clusters in narrow views" 
This reverts commit a28e476499.

Change-Id: I73fe7b3e6bdba327e55a58afd36a7f58f49945d0
 2014-07-28 19:52:11 +00:00
Alan Lau
3150372342 am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '97170e0c48bbff21ef6773110d950621131cf9dd':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:10:29 +00:00
Anish Athalye
c51a6e45e8 am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'a28e4764994283c3595dd41f12e425cf7dc0d985':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:10:19 +00:00
Anish Athalye
a28e476499 DO NOT MERGE Fix line breaking for clusters in narrow views 
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.

Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit 162713dd0b72af79c1b2286985f7e79f043cd915)
 2014-07-28 18:47:40 +00:00
Alan Lau
40b0d4d751 Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Alan Lau
97170e0c48 Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Anish Athalye
0c87dfd25d DO NOT MERGE Implement line breaking using ICU break iterator 
Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
(cherry picked from commit f8133ae5896926aaf70f12bc0dd1f36a6704c0f5)
 2014-07-28 18:48:01 +00:00
Robert Ly
39572996f2 am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs 
* commit '1903bbb88d8e2e1921b0441911cb73966d3bca4a':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
 2014-07-23 21:06:47 +00:00
Scott Rowe
e2bdaea318 cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1 
Change-Id: I21424c1407b44554ac135248dabc2328bc70aef9
 2014-07-23 20:54:50 +00:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:29:08 +00:00
Andrew Solovay
5ae1335477 cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38 
Doc had inaccurately said that getLaunchIntentForPackage() throws an
exception if the package name is not recognized; in fact, it returns
null. Also cleaned up some style issues for that Javadoc item.

Doc is staged to:

http://asolovay.mtv:9655/reference/android/content/pm/PackageManager.html#getLaunchIntentForPackage(java.lang.String)

Bug: 15022655
Original SHA1: I2eab0956eaedac71289e19a3618a3553908f8c38

Change-Id: Ief8dfaac248ba03779c6f13237aff9b26d362fd9
 2014-07-15 15:08:58 -07:00
Brian Carlstrom
1f8eb4a6b0 am 044492e1: am 52a154fe: Merge "Remove" 
* commit '044492e1b710c1e604c02b08e0ec97cbb1d5d513':
  Remove
 2014-07-07 21:00:07 +00:00
Brian Carlstrom
044492e1b7 am 52a154fe: Merge "Remove" 
* commit '52a154febb7c06b142116235c368417dd5e542ba':
  Remove
 2014-07-07 20:55:16 +00:00
Brian Carlstrom
87f597465c Remove 
(cherry picked from commit 9881203920c8445e9a4bdd9e4a90ba0014f34c5e)

Change-Id: Ib40823b7c03af4c71da902b0e5c504e074cf0dd9
 2014-07-07 11:31:47 -07:00
Nick Kralevich
7bb13f74da am 7228aa10: am 42b74e23: Merge "Typo in method name: Clone" 
* commit '7228aa109aaef18b8447b369ae2a90cecf2c9601':
  Typo in method name: Clone
 2014-07-05 17:22:51 +00:00
Nick Kralevich
6b26ded8ce am d05a0743: am a347ece5: Merge "Fix typo in comment of FragmentTransaction" 
* commit 'd05a0743484da59d341792749a3cf35f18a7e11c':
  Fix typo in comment of FragmentTransaction
 2014-07-05 17:17:40 +00:00
Nick Kralevich
7228aa109a am 42b74e23: Merge "Typo in method name: Clone" 
* commit '42b74e231d893f553e4e8c88641e056ebcf82ac5':
  Typo in method name: Clone
 2014-07-05 17:16:59 +00:00
Nick Kralevich
d05a074348 am a347ece5: Merge "Fix typo in comment of FragmentTransaction" 
* commit 'a347ece5a77d4b695af6255d751d98dbb519ad74':
  Fix typo in comment of FragmentTransaction
 2014-07-05 17:11:42 +00:00
Nick Kralevich
89c9c67a33 am d92ab153: am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator" 
* commit 'd92ab153a3a33dcd1304661a9929112ab0b40d5a':
  Fix a copy/paste typo in ViewPropertyAnimator
 2014-07-05 16:56:47 +00:00
Nick Kralevich
d92ab153a3 am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator" 
* commit 'a6336747a42fa5b64f82b7fe57ddf614d1fda9b2':
  Fix a copy/paste typo in ViewPropertyAnimator
 2014-07-05 16:52:11 +00:00
Nick Kralevich
3d24150dbb am 23219098: am b70888d4: Merge "Fix a typo in a javadoc comment" 
* commit '23219098a6d623cf1825d8fd9a8d200cdc06aab9':
  Fix a typo in a javadoc comment
 2014-07-05 16:51:38 +00:00
Nick Kralevich
3cdc06bb37 am dbb32da8: am c9eff23b: Merge "Fix typo in DevicePolicyManager documentation" 
* commit 'dbb32da844cf8ed65d0b5005276a86aad7c81853':
  Fix typo in DevicePolicyManager documentation
 2014-07-05 16:51:32 +00:00
Nick Kralevich
23219098a6 am b70888d4: Merge "Fix a typo in a javadoc comment" 
* commit 'b70888d45573c015fbb9d584df575bf78f5e9684':
  Fix a typo in a javadoc comment
 2014-07-05 16:45:31 +00:00
Nick Kralevich
dbb32da844 am c9eff23b: Merge "Fix typo in DevicePolicyManager documentation" 
* commit 'c9eff23b443f26fb8c4873a6ecb61eded0564163':
  Fix typo in DevicePolicyManager documentation
 2014-07-05 16:45:26 +00:00
Nick Kralevich
3e5f0229e1 am 58005ec5: am 3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 
* commit '58005ec545fd011418b6400a3b377fea6928c933':
  Fix javadoc typo in Message.java: "arg1" -> "arg2"
 2014-07-05 16:40:59 +00:00
Nick Kralevich
58005ec545 am 3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 
* commit '3b345a6f9103c1677a696b4770cc318df45cdcaa':
  Fix javadoc typo in Message.java: "arg1" -> "arg2"
 2014-07-05 16:35:13 +00:00
Brian Duff
51d70ce9b8 am c542745e: am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'c542745e23fe9d2e71c1f607d66f5570f585133d':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 09:43:56 +00:00
Brian Duff
c542745e23 am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 06:45:04 +00:00
Nick Kralevich
a347ece5a7 Merge "Fix typo in comment of FragmentTransaction" 2014-07-03 01:32:01 +00:00
Nick Kralevich
c9eff23b44 Merge "Fix typo in DevicePolicyManager documentation" 2014-07-03 01:32:01 +00:00
Nick Kralevich
a6336747a4 Merge "Fix a copy/paste typo in ViewPropertyAnimator" 2014-07-02 20:52:43 +00:00
Nick Kralevich
b70888d455 Merge "Fix a typo in a javadoc comment" 2014-07-02 20:52:43 +00:00
Nick Kralevich
42b74e231d Merge "Typo in method name: Clone" 2014-07-02 20:51:20 +00:00
Nick Kralevich
3b345a6f91 Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 2014-07-02 20:51:20 +00:00
Brian Duff
a6e9dd3f9a Merge "Fix a typo in NumberPicker javadoc." 2014-07-02 20:51:20 +00:00
Narayan Kamath
816cff12e1 am c141ae54: am 989ab6d3: Merge "Update javadoc for android.os.Bundle." 
* commit 'c141ae547e9b295ce9013591a6fbb902b0e40073':
  Update javadoc for android.os.Bundle.
 2014-06-24 10:18:23 +00:00
Narayan Kamath
c141ae547e am 989ab6d3: Merge "Update javadoc for android.os.Bundle." 
* commit '989ab6d38d77c0a1f7dc5e648e1950410d5d01d4':
  Update javadoc for android.os.Bundle.
 2014-06-24 10:08:52 +00:00
Narayan Kamath
989ab6d38d Merge "Update javadoc for android.os.Bundle." 2014-06-24 06:22:45 +00:00
Robert Greenwalt
0b57289678 Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function" 2014-06-23 21:56:07 +00:00
Marco Nelissen
909a1b2e73 am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug" 
* commit 'c4d37f58a1b5405812eaf96b4bd3a051d86884eb':
  Fix thumbnail bug
 2014-06-23 21:51:38 +00:00
Jianzheng Zhou
78c8e7c8bf DO NOT MERGE refactor wifi p2p's startDhcpServer function 
Add getTetheredDhcpRanges() interface and call it before calling
mNwService.startTethering() to update dhcp ranges. This will allow p2p app
to run well concurrently with other tethering app(e.g. usb tethering).

Change-Id: I5e8ffeb5d2d396f48b897cd9396f133e25ecca57
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2014-06-23 21:02:45 +00:00
Michael Kolb
c6ffc840c4 am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev 
* commit '270c099faf63868dcc21836a84de778337ff3be9':
  Move emulator check & save system properties access
 2014-06-21 20:15:47 +00:00